From c00e1d61dd82a9f9eab25e45b888b6f6966904b2 Mon Sep 17 00:00:00 2001 From: Manoj Gupta Date: Wed, 9 Nov 2016 10:05:55 -0800 Subject: Fix crosperf crashes when running non-telemetry test on R53 or older images. Do not call decrease wait time for non-telemetry tests. BUG: chromium:663435 TEST:crosperf unit tests Change-Id: Ia13eb8f258ab8fc09fdfbdb4b93a6745e06b44b1 Reviewed-on: https://chrome-internal-review.googlesource.com/303736 Commit-Ready: Manoj Gupta Tested-by: Manoj Gupta Reviewed-by: Caroline Tice --- crosperf/suite_runner.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crosperf/suite_runner.py') diff --git a/crosperf/suite_runner.py b/crosperf/suite_runner.py index 81c8bd5c..8e9ef457 100644 --- a/crosperf/suite_runner.py +++ b/crosperf/suite_runner.py @@ -58,11 +58,12 @@ class SuiteRunner(object): def Run(self, machine, label, benchmark, test_args, profiler_args): for i in range(0, benchmark.retries + 1): - self.DecreaseWaitTime(machine, label.chromeos_root) self.PinGovernorExecutionFrequencies(machine, label.chromeos_root) if benchmark.suite == 'telemetry': + self.DecreaseWaitTime(machine, label.chromeos_root) ret_tup = self.Telemetry_Run(machine, label, benchmark, profiler_args) elif benchmark.suite == 'telemetry_Crosperf': + self.DecreaseWaitTime(machine, label.chromeos_root) ret_tup = self.Telemetry_Crosperf_Run(machine, label, benchmark, test_args, profiler_args) else: -- cgit v1.2.3