Tune down multiplier for tsan to 5

9 years ago · 2146fe8f88
parent 2d435b9178
commit 2146fe8f88
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -187,7 +187,7 @@ LD_tsan = clang
 LDXX_tsan = clang++
 CPPFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument -fPIE -pie -DGPR_NO_DIRECT_SYSCALLS
 LDFLAGS_tsan = -fsanitize=thread -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,)
-DEFINES_tsan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=20
+DEFINES_tsan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=5

 VALID_CONFIG_msan = 1
 REQUIRE_CUSTOM_LIBRARIES_msan = 1
--- a/build.yaml
+++ b/build.yaml
@ -2703,7 +2703,7 @@ configs:
    compile_the_world: true
    test_environ:
      TSAN_OPTIONS: suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
-    timeout_multiplier: 20
+    timeout_multiplier: 5
  ubsan:
    CC: clang
    CPPFLAGS: -O1 -fsanitize=undefined -fno-omit-frame-pointer -Wno-unused-command-line-argument
--- a/tools/run_tests/configs.json
+++ b/tools/run_tests/configs.json
@ -55,7 +55,7 @@
    "environ": {
      "TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
    }, 
-    "timeout_multiplier": 20
+    "timeout_multiplier": 5
  }, 
  {
    "config": "msan",