Adds the ability for the client.bin.base_job class to keep track of run
numbers and include them in the output directory / test tag.
Adds the ability for the client.bin.base_job class to insert the
running kernel version (uname -r) into the test tag at run_test() time.
Enabled both of the above in the generated control file when multiple
kernels are given via the AFE.
Signed-off-by: Gregory Smith <gps@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2433 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/frontend/afe/control_file.py b/frontend/afe/control_file.py
index 0362ef3..fafb25a 100644
--- a/frontend/afe/control_file.py
+++ b/frontend/afe/control_file.py
@@ -19,6 +19,9 @@
for kernel_version in kernel_list:
job.next_step(boot_kernel, kernel_version)
job.next_step(step_test, kernel_version)
+ if len(kernel_list) > 1:
+ job.set_run_number(1) # Include run numbers in output directory names.
+ job.show_kernel_in_test_tag(True) # Include kernel in output dir name.
def boot_kernel(kernel_version):
testkernel = job.kernel(kernel_version)
@@ -29,8 +32,6 @@
def step_test(kernel_version):
global kernel
kernel = kernel_version # Set the global in case anyone is using it.
- if len(kernel_list) > 1:
- job.set_test_tag_prefix(kernel_version) # Separate output by kernel.
"""
SERVER_KERNEL_TEMPLATE = """\