build/android/pylib/perf/test_runner.py - Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: fixed bad android build patch Created 5 years, 9 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:

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 d9227a5ed5a8a5ce6eaf8e028a1a85076af7cc5c..da66d070dd375370b9df8e2c01d7e030d1b2278e 100644

--- a/build/android/pylib/perf/test_runner.py

+++ b/build/android/pylib/perf/test_runner.py

@@ -250,9 +250,10 @@ class TestRunner(base_test_runner.BaseTestRunner):

logging.info('%s : %s', test_name, cmd)

start_time = datetime.datetime.now()

- timeout = 5400

+ timeout = self._tests['steps'][test_name].get('timeout', 5400)

if self._options.no_timeout:

timeout = None

+ logging.info('Timeout for %s test: %s', test_name, timeout)

full_cmd = cmd

if self._options.dry_run:

full_cmd = 'echo %s' % cmd