diff --git a/Makefile b/Makefile index 5abd21c863b8faaa545ef7fa338cc2ab066f2c4e..e4dc2a61272eee1ff144018c6d1d20017314bb10 100644 --- a/Makefile +++ b/Makefile @@ -117,6 +117,7 @@ DEFINES_helgrind = _DEBUG DEBUG DEFINES_helgrind += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=20 VALID_CONFIG_asan-noleaks = 1 +REQUIRE_CUSTOM_LIBRARIES_asan-noleaks = 1 CC_asan-noleaks = clang CXX_asan-noleaks = clang++ LD_asan-noleaks = clang @@ -124,6 +125,7 @@ LDXX_asan-noleaks = clang++ CFLAGS_asan-noleaks = -O0 -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument CXXFLAGS_asan-noleaks = -O0 -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument LDFLAGS_asan-noleaks = -fsanitize=address +DEFINES_asan-noleaks += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=1.5 VALID_CONFIG_ubsan = 1 REQUIRE_CUSTOM_LIBRARIES_ubsan = 1 @@ -183,6 +185,7 @@ LDXX_asan = clang++ CFLAGS_asan = -O0 -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument CXXFLAGS_asan = -O0 -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument LDFLAGS_asan = -fsanitize=address +DEFINES_asan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=1.5 VALID_CONFIG_tsan = 1 REQUIRE_CUSTOM_LIBRARIES_tsan = 1 diff --git a/build.yaml b/build.yaml index 6af1f7165a898e60ed2eb63522d9046a41e7c703..cf53af57d82fff8cd48c9661a0d9bf62206db045 100644 --- a/build.yaml +++ b/build.yaml @@ -2494,6 +2494,7 @@ configs: test_environ: ASAN_OPTIONS: suppressions=tools/asan_suppressions.txt:detect_leaks=1:color=always LSAN_OPTIONS: suppressions=tools/asan_suppressions.txt:report_objects=1 + timeout_multiplier: 1.5 asan-noleaks: CC: clang CFLAGS: -O0 -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument @@ -2502,9 +2503,10 @@ configs: LD: clang LDFLAGS: -fsanitize=address LDXX: clang++ - custom_libraries: true + compile_the_world: true test_environ: ASAN_OPTIONS: detect_leaks=0:color=always + timeout_multiplier: 1.5 basicprof: CPPFLAGS: -O2 -DGRPC_BASIC_PROFILER -DGRPC_TIMERS_RDTSC DEFINES: NDEBUG diff --git a/tools/run_tests/configs.json b/tools/run_tests/configs.json index ef2ab61daae5877c066469b9c0cd9778d8f2d266..769942df996165e9661bb95de955d2105140a8c4 100644 --- a/tools/run_tests/configs.json +++ b/tools/run_tests/configs.json @@ -17,7 +17,8 @@ "config": "asan-noleaks", "environ": { "ASAN_OPTIONS": "detect_leaks=0:color=always" - } + }, + "timeout_multiplier": 1.5 }, { "config": "ubsan", @@ -46,7 +47,8 @@ "environ": { "ASAN_OPTIONS": "suppressions=tools/asan_suppressions.txt:detect_leaks=1:color=always", "LSAN_OPTIONS": "suppressions=tools/asan_suppressions.txt:report_objects=1" - } + }, + "timeout_multiplier": 1.5 }, { "config": "tsan",