diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-08 05:11:15 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-08 05:11:15 +0000 |
| commit | 3cf8d50d1ecc3e9c2dc756cff4d1ff9fcb6c80b9 (patch) | |
| tree | 7e475401fefe1575fb0794e6f6e34c9a4a723faa /tools | |
| parent | c5fb7e5b73ca587ea59c1657bd221af0743929d5 (diff) | |
accurate, exhaustive "fast" version of this test
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/generated/tests.json | 1 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 72e840e2f2..fa75017781 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -4195,6 +4195,7 @@ "posix", "windows" ], + "timeout_seconds": 1200, "uses_polling": false }, { diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 7c65067857..6bdd8be7e9 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -353,7 +353,7 @@ class CLanguage(object): out.append(self.config.job_spec(cmdline, shortname='%s %s' % (' '.join(cmdline), shortname_ext), cpu_cost=cpu_cost, - timeout_seconds=_DEFAULT_TIMEOUT_SECONDS * timeout_scaling, + timeout_seconds=target.get('timeout_seconds', _DEFAULT_TIMEOUT_SECONDS) * timeout_scaling, environ=env)) else: cmdline = [binary] + target['args'] |