From 81df68d6474ed2afb6cb95d8e180cf5d6ff33713 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 21 Jan 2016 13:59:50 -0800
Subject: [PATCH] Add some time dilation for ASAN builds
---
Makefile | 3 +++
build.yaml | 4 +++-
tools/run_tests/configs.json | 6 ++++--
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 5abd21c863..e4dc2a6127 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 6af1f7165a..cf53af57d8 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 ef2ab61daa..769942df99 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",
--
GitLab