Merge pull request #13824 from ncteisen/fix-trickle

Make benchmark tests use correct timeout
7 years ago · 98350e96e7
parent 2ec756774e e2612aa0e8
commit 98350e96e7
1 changed files with 3 additions and 1 deletions
--- 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']: