From b2ea0b9f4808f4ce19538cd26e92c508c13b6552 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 26 Aug 2015 13:06:53 -0700
Subject: [PATCH] Up asan/tsan timeouts - they need it
---
tools/run_tests/jobset.py | 1 -
tools/run_tests/run_tests.py | 8 +++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py
index 79dde55d6f..2a86319125 100755
--- a/tools/run_tests/jobset.py
+++ b/tools/run_tests/jobset.py
@@ -174,7 +174,6 @@ class Job(object):
for k, v in add_env.iteritems():
env[k] = v
self._start = time.time()
- print spec.cmdline
self._process = subprocess.Popen(args=spec.cmdline,
stderr=subprocess.STDOUT,
stdout=self._tempfile,
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 80854001d3..977d9c8aea 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -70,13 +70,14 @@ def platform_string():
# SimpleConfig: just compile with CONFIG=config, and run the binary to test
class SimpleConfig(object):
- def __init__(self, config, environ=None):
+ def __init__(self, config, environ=None, timeout_seconds=5*60):
if environ is None:
environ = {}
self.build_config = config
self.allow_hashing = (config != 'gcov')
self.environ = environ
self.environ['CONFIG'] = config
+ self.timeout_seconds = timeout_seconds
def job_spec(self, cmdline, hash_targets, shortname=None, environ={}):
"""Construct a jobset.JobSpec for a test under this config
@@ -96,6 +97,7 @@ class SimpleConfig(object):
return jobset.JobSpec(cmdline=cmdline,
shortname=shortname,
environ=actual_environ,
+ timeout_seconds=self.timeout_seconds,
hash_targets=hash_targets
if self.allow_hashing else None)
@@ -354,11 +356,11 @@ class Build(object):
_CONFIGS = {
'dbg': SimpleConfig('dbg'),
'opt': SimpleConfig('opt'),
- 'tsan': SimpleConfig('tsan', environ={
+ 'tsan': SimpleConfig('tsan', timeout_seconds=10*60, environ={
'TSAN_OPTIONS': 'suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1'}),
'msan': SimpleConfig('msan'),
'ubsan': SimpleConfig('ubsan'),
- 'asan': SimpleConfig('asan', environ={
+ 'asan': SimpleConfig('asan', timeout_seconds=7*60, environ={
'ASAN_OPTIONS': 'detect_leaks=1:color=always:suppressions=tools/tsan_suppressions.txt',
'LSAN_OPTIONS': 'report_objects=1'}),
'asan-noleaks': SimpleConfig('asan', environ={
--
GitLab