aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests
diff options
context:
space:
mode:
authorGravatar ncteisen <ncteisen@gmail.com>2017-12-19 15:00:35 -0800
committerGravatar ncteisen <ncteisen@gmail.com>2017-12-19 15:00:35 -0800
commite2612aa0e85a3dd2e1060d24c8bc558e66939ac2 (patch)
tree7d620790ee6b323fe59552fcd4e5c0071cb06ba9 /tools/run_tests
parent0dd982cf4c409d072f2b1c537d65f93001cc0f77 (diff)
Use correct timeout for benchmarks
Diffstat (limited to 'tools/run_tests')
-rwxr-xr-xtools/run_tests/run_tests.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index bd5b8644b3..3aa9eb87c7 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -385,7 +385,9 @@ class CLanguage(object):
shortname='%s %s' % (' '.join(cmdline),
shortname_ext),
cpu_cost=cpu_cost,
- timeout_seconds=_DEFAULT_TIMEOUT_SECONDS *
+ timeout_seconds=target.get(
+ 'timeout_seconds',
+ _DEFAULT_TIMEOUT_SECONDS) *
timeout_scaling,
environ=env))
elif 'gtest' in target and target['gtest']: