commit 71a8604488a22ea2d36f8aca04010d88ed45f5bf
author Craig Tiller <ctiller@google.com> Fri Jan 15 14:59:58 2016 -0800
committer Craig Tiller <ctiller@google.com> Fri Jan 15 14:59:58 2016 -0800
tree 4bb4e11f3673e072ad2e04fe4f3200a6f78a569f
parent 623ca7dd9408fea1b6e88be0ca1e0f845a0533e8

Fix TSAN on Jenkins and on my machine

tools/run_tests/run_tests.py

diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 0de20a6..97962bd 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -772,9 +772,10 @@
       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 []