diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-01-15 16:04:57 -0800 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-01-15 16:04:57 -0800 |
| commit | a0fffb7bfb4b9ad7e51395a3a818518c3134a2e0 (patch) | |
| tree | 469d6f40d006278aa18f42de5ab5395652194f90 /tools | |
| parent | 57633ea87b35873a7d139cc70b8cf42226042cbe (diff) | |
| parent | 71a8604488a22ea2d36f8aca04010d88ed45f5bf (diff) | |
Merge pull request #4752 from ctiller/isolated_emus
Fix TSAN on Jenkins and on my machine
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 0de20a634a..97962bd928 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -772,9 +772,10 @@ else: return [jobset.JobSpec([os.getenv('MAKE', 'make'), '-f', makefile, '-j', '%d' % (multiprocessing.cpu_count() + 1), - 'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' % - args.slowdown, - 'CONFIG=%s' % cfg] + targets, + 'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' % args.slowdown, + 'CONFIG=%s' % cfg] + + ([] if not args.travis else ['JENKINS_BUILD=1']) + + targets, timeout_seconds=30*60)] else: return [] |