diff options
| author | Zhizhou Yang <zhizhouy@google.com> | 2019-08-28 17:11:12 -0700 |
|---|---|---|
| committer | Zhizhou Yang <zhizhouy@google.com> | 2019-09-03 22:59:58 +0000 |
| commit | f1c5bc99c10e01568079debbf14a9eab84ca26d3 (patch) | |
| tree | cd8c3962ed237f7399c4bf328849b62253b8445b /crosperf/suite_runner.py | |
| parent | c856b68b3ca72481a147e73108ea95b030da2606 (diff) | |
| download | toolchain-utils-f1c5bc99c10e01568079debbf14a9eab84ca26d3.tar.gz | |
crosperf: update skylab command line
Recently there are some big changes to options of skylab command, this
patch updates the command to the newest version.
BUG=chromium:984790
TEST=Tested with different crosperf tests.
Change-Id: I6ed81c00372668914f79b66c1e18d980c073593d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1775533
Reviewed-by: Caroline Tice <cmtice@chromium.org>
Commit-Queue: Zhizhou Yang <zhizhouy@google.com>
Tested-by: Zhizhou Yang <zhizhouy@google.com>
Auto-Submit: Zhizhou Yang <zhizhouy@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Diffstat (limited to 'crosperf/suite_runner.py')
| -rw-r--r-- | crosperf/suite_runner.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/crosperf/suite_runner.py b/crosperf/suite_runner.py index 5a32f92b..6e24c28c 100644 --- a/crosperf/suite_runner.py +++ b/crosperf/suite_runner.py @@ -270,9 +270,12 @@ class SuiteRunner(object): def Skylab_Run(self, label, benchmark, test_args, profiler_args): """Run the test via skylab..""" - options = '' + # Skylab by default uses cros_test_platform to start test. + # We don't use it for now since we want to directly interact with dut. + options = '-bb=false' + if benchmark.suite != 'telemetry_Crosperf': - options += '-client-test' + options += ' -client-test' if label.board: options += ' -board=%s' % label.board if label.build: @@ -300,10 +303,10 @@ class SuiteRunner(object): dimensions = '' for dut in label.remote: - dimensions += ' dut_name:%s' % dut.rstrip('.cros') + dimensions += ' -dim dut_name:%s' % dut.rstrip('.cros') command = (('%s create-test %s %s %s') % \ - (SKYLAB_PATH, options, benchmark.test_name, dimensions)) + (SKYLAB_PATH, dimensions, options, benchmark.test_name)) if self.log_level != 'verbose': self.logger.LogOutput('Starting skylab test.') @@ -319,7 +322,7 @@ class SuiteRunner(object): # We want to parse it and get the id number of the task. task_id = ret_tup[1].strip().split('id=')[1] - command = ('skylab wait-task %s' % (task_id)) + command = ('skylab wait-task -bb=false %s' % (task_id)) if self.log_level != 'verbose': self.logger.LogOutput('Waiting for skylab test to finish.') self.logger.LogOutput('CMD: %s' % command) |