Run client-side reboots in a test group, and include information
about the kernel booted in the group END logging.
This required enhancing the client-side job code to preserve the
logging indentation across reboots.
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1480 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/kernel.py b/client/bin/kernel.py
index 1e81068..20485a0 100755
--- a/client/bin/kernel.py
+++ b/client/bin/kernel.py
@@ -80,6 +80,7 @@
logpath = os.path.join(self.log_dir, 'build_log')
self.logfile = open(logpath, 'w+')
+ self.applied_patches = []
self.target_arch = None
self.build_target = 'bzImage'
@@ -196,10 +197,12 @@
else:
ref = force_copy(local, self.results_dir)
ref = self.job.relative_path(ref)
- log = 'PATCH: %s %s %s\n' % (spec, ref, md5sum)
+ patch_id = "%s %s %s" % (spec, ref, md5sum)
+ log = "PATCH: " + patch_id + "\n"
print log
cat_file_to_cmd(local, 'patch -p1 > /dev/null')
self.logfile.write(log)
+ self.applied_patches.append(patch_id)
def get_kernel_tree(self, base_tree):
@@ -493,7 +496,8 @@
args += " IDENT=%d" % (when)
self.job.next_step_prepend(["job.kernel_check_ident",
- when, ident, self.subdir])
+ when, ident, self.subdir,
+ self.applied_patches])
# Check if the kernel has been installed, if not install
# as the default tag and boot that.