autotest: Add flag to autoserv to disable sysinfo step
This saves us time when we don't care about this step.
BUG=chromium:258507
TEST=Ran autoserv directly with --disable_sysinfo and observed
appropriate messages omited/emited.
Change-Id: I57af12a2216a87ecb2c5719591eb1d2497731404
Reviewed-on: https://gerrit.chromium.org/gerrit/61299
Tested-by: Christopher Wiley <[email protected]>
Reviewed-by: Alex Miller <[email protected]>
Commit-Queue: Christopher Wiley <[email protected]>
diff --git a/server/autoserv b/server/autoserv
index 8d2623e..59ecd05 100755
--- a/server/autoserv
+++ b/server/autoserv
@@ -145,7 +145,8 @@
parser.parser.error("-G %r may only be supplied with more than one machine."
% group_name)
- kwargs = {'group_name': group_name, 'tag': execution_tag}
+ kwargs = {'group_name': group_name, 'tag': execution_tag,
+ 'disable_sysinfo': parser.options.disable_sysinfo}
if control_filename:
kwargs['control_filename'] = control_filename
job = server_job.server_job(control, parser.args[1:], results, label,
diff --git a/server/autoserv_parser.py b/server/autoserv_parser.py
index 8469bab..c3ecf9f 100644
--- a/server/autoserv_parser.py
+++ b/server/autoserv_parser.py
@@ -152,6 +152,10 @@
dest="skip_crash_collection", default=False,
help=("Turns off crash collection to shave time "
"off test runs."))
+ self.parser.add_option("--disable_sysinfo", action="store_true",
+ dest="disable_sysinfo", default=False,
+ help="Turns off sysinfo collection to shave "
+ "time off test runs.")
def parse_args(self):
diff --git a/server/server_job.py b/server/server_job.py
index 2f50492..29fac23 100644
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -144,7 +144,7 @@
def __init__(self, control, args, resultdir, label, user, machines,
client=False, parse_job='',
ssh_user='root', ssh_port=22, ssh_pass='', test_retry=0,
- group_name='', tag='',
+ group_name='', tag='', disable_sysinfo=False,
control_filename=SERVER_CONTROL_FILENAME):
"""
Create a server side job object.
@@ -165,6 +165,8 @@
@param group_name: If supplied, this will be written out as
host_group_name in the keyvals file for the parser.
@param tag: The job execution tag from the scheduler. [optional]
+ @param disable_sysinfo: Whether we should disable the sysinfo step of
+ tests for a modest shortening of test time. [optional]
@param control_filename: The filename where the server control file
should be written in the results directory.
"""
@@ -199,6 +201,7 @@
self.drop_caches = False
self.drop_caches_between_iterations = False
self._control_filename = control_filename
+ self._disable_sysinfo = disable_sysinfo
self.logging = logging_manager.get_logging_manager(
manage_stdout_and_stderr=True, redirect_fds=True)
@@ -639,6 +642,9 @@
url
url of the test to run
"""
+ if self._disable_sysinfo:
+ dargs['disable_sysinfo'] = True
+
group, testname = self.pkgmgr.get_package_name(url, 'test')
testname, subdir, tag = self._build_tagged_test_name(testname, dargs)
outputdir = self._make_test_outputdir(subdir)
