Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: build/android/pylib/perf/test_runner.py

Issue 23784006: [Android] Add --no-timeout to perf sharder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pass retries through Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/perf/test_options.py ('k') | build/android/test_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/perf/test_runner.py
diff --git a/build/android/pylib/perf/test_runner.py b/build/android/pylib/perf/test_runner.py
index f125a234b0b9c7c0b9cd514b3d6bdc93cb65e5c7..3b104c03a8c0cf8865ced85fae4fdd0c16b853b7 100644
--- a/build/android/pylib/perf/test_runner.py
+++ b/build/android/pylib/perf/test_runner.py
@@ -114,9 +114,14 @@ class TestRunner(base_test_runner.BaseTestRunner):
(self._tests[test_name], self.device))
logging.info('%s : %s', test_name, cmd)
start_time = datetime.datetime.now()
+
+ timeout = 1800
+ if self._options.no_timeout:
+ timeout = None
+
output, exit_code = pexpect.run(
cmd, cwd=os.path.abspath(constants.DIR_SOURCE_ROOT),
- withexitstatus=True, logfile=sys.stdout, timeout=1800,
+ withexitstatus=True, logfile=sys.stdout, timeout=timeout,
env=os.environ)
end_time = datetime.datetime.now()
if exit_code is None:
« no previous file with comments | « build/android/pylib/perf/test_options.py ('k') | build/android/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698