Merge pull request grpc#3086 from ctiller/radio-ga-ga

Increase msan timeout also
xiexiemanyou · Aug 26, 2015 · d739ece · d739ece
2 parents 4381380 + 4a71ce2
commit d739ece
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
@@ -358,7 +358,7 @@ def __str__(self):
     'opt': SimpleConfig('opt'),
     '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'),
+    'msan': SimpleConfig('msan', timeout_seconds=7*60),
     'ubsan': SimpleConfig('ubsan'),
     'asan': SimpleConfig('asan', timeout_seconds=7*60, environ={
         'ASAN_OPTIONS': 'detect_leaks=1:color=always:suppressions=tools/tsan_suppressions.txt',