diff options
| author |  Robbie Shade <rjshade@google.com> | 2017-01-17 09:14:29 -0500 |
|---|---|---|
| committer | Robbie Shade <rjshade@google.com> | 2017-01-31 15:40:20 -0500 |
| commit | ca7effcdff69baba8e52e4c83fe808491df60f36 (patch) | |
| tree | 7e04f13f655f44c5930233381b615e1d54e5386e /tools | |
| parent | c88834ba996084db5f530706a09892bdd900e7dc (diff) | |
Replace timeout/scaling macros with functions.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/generated/configs.json | 20 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 11 |
2 files changed, 17 insertions, 14 deletions
diff --git a/tools/run_tests/generated/configs.json b/tools/run_tests/generated/configs.json index f2c110766b..091f5d9823 100644 --- a/tools/run_tests/generated/configs.json +++ b/tools/run_tests/generated/configs.json @@ -7,7 +7,6 @@ }, { "config": "helgrind", - "timeout_multiplier": 20, "tool_prefix": [ "valgrind", "--tool=helgrind" @@ -17,16 +16,14 @@ "config": "asan-noleaks", "environ": { "ASAN_OPTIONS": "detect_leaks=0:color=always" - }, - "timeout_multiplier": 3 + } }, { "config": "asan-trace-cmp", "environ": { "ASAN_OPTIONS": "detect_leaks=1:color=always", "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1" - }, - "timeout_multiplier": 3 + } }, { "config": "dbg" @@ -39,7 +36,6 @@ }, { "config": "memcheck", - "timeout_multiplier": 10, "tool_prefix": [ "valgrind", "--tool=memcheck", @@ -51,26 +47,22 @@ "environ": { "ASAN_OPTIONS": "detect_leaks=1:color=always", "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1" - }, - "timeout_multiplier": 3 + } }, { "config": "tsan", "environ": { "TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1" - }, - "timeout_multiplier": 5 + } }, { "config": "ubsan", "environ": { "UBSAN_OPTIONS": "halt_on_error=1:print_stacktrace=1" - }, - "timeout_multiplier": 1.5 + } }, { - "config": "msan", - "timeout_multiplier": 4 + "config": "msan" }, { "config": "mutrace" diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 5aae3432e1..c182288679 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -234,6 +234,17 @@ class CLanguage(object): timeout_scaling = 1 if polling_strategy == 'poll-cv': timeout_scaling *= 5 + + # Scale overall test timeout if running under various sanitizers. + config = self.args.config + if ('asan' in config + or config == 'msan' + or config == 'tsan' + or config == 'ubsan' + or config == 'helgrind' + or config == 'memcheck'): + timeout_scaling *= 20 + if self.config.build_config in target['exclude_configs']: continue if self.args.iomgr_platform in target.get('exclude_iomgrs', []): |