Add profiler support to the server-side control file generation.
Risk: Low
Visibility: You can use the frontend control file generation for
profilers even with server-side jobs.
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2539 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/frontend/afe/control_file.py b/frontend/afe/control_file.py
index fafb25a..35ae4f5 100644
--- a/frontend/afe/control_file.py
+++ b/frontend/afe/control_file.py
@@ -119,7 +119,7 @@
def _get_tests_stanza(raw_control_files, is_server, prepend, append):
if is_server:
- return '\n'.join(raw_control_files)
+ return '\n'.join(prepend + raw_control_files + append)
raw_steps = prepend + [add_boilerplate_to_nested_steps(step)
for step in raw_control_files] + append
steps = [format_step(index, step)
@@ -135,8 +135,6 @@
def _get_profiler_commands(profilers, is_server):
prepend, append = [], []
- if is_server:
- return prepend, append
for profiler in profilers:
prepend.append("job.profilers.add('%s')" % profiler.name)
append.append("job.profilers.delete('%s')" % profiler.name)