summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-19 01:01:47 +0000
committerfrankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-19 01:01:47 +0000
commitdf772c31fbca3ee58c3cfde539b751086a20a323 (patch)
tree2db36d0606e5a8515e5a80e98fa58b4a27ff47f7
parent5ff6e79468ba7e90d89a268f89b18ef5f4b7908d (diff)
downloadchromium_src-df772c31fbca3ee58c3cfde539b751086a20a323.zip
chromium_src-df772c31fbca3ee58c3cfde539b751086a20a323.tar.gz
chromium_src-df772c31fbca3ee58c3cfde539b751086a20a323.tar.bz2
[Android] Guard perf_control creation in gtest test_runner.
BUG=None TBR=skyostil@chromium.org Review URL: https://codereview.chromium.org/63403006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235862 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/android/pylib/gtest/test_runner.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index c47bf66..e4f98ff 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -52,7 +52,8 @@ class TestRunner(base_test_runner.BaseTestRunner):
timeout = timeout * 2
self._timeout = timeout * self.tool.GetTimeoutScale()
- self._perf_controller = perf_control.PerfControl(self.adb)
+ if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name):
+ self._perf_controller = perf_control.PerfControl(self.adb)
#override
def InstallTestPackage(self):