Skip to content

Commit

Permalink
Merge pull request RobotLocomotion#8692 from jamiesnape/asan-valgrind…
Browse files Browse the repository at this point in the history
…-timeouts

Increase timeout multipliers for tests under AddressSanitizer and Valgrind
  • Loading branch information
jamiesnape authored Apr 26, 2018
2 parents 25eaffe + a749758 commit aa70a7d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions common/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -891,8 +891,6 @@ drake_cc_googletest(

drake_cc_googletest(
name = "symbolic_polynomial_test",
# Test timeout increased to not timeout when run with AddressSanitizer.
timeout = "moderate",
deps = [
":symbolic",
"//common/test_utilities:symbolic_test_util",
Expand Down
10 changes: 5 additions & 5 deletions tools/dynamic_analysis/bazel.rc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ test:asan --test_tag_filters=-gurobi,-mosek,-snopt,-no_asan,-no_lsan
test:asan --test_lang_filters=-sh,-py
# Typical slowdown introduced by AddressSanitizer is 2x.
# See https://clang.llvm.org/docs/AddressSanitizer.html
test:asan --test_timeout=120,600,1800,7200
test:asan --test_timeout=150,750,2250,9000 # 2.5x

### ASan everything build. ###
build:asan_everything --define=WITH_GUROBI=ON
Expand All @@ -66,7 +66,7 @@ test:asan_everything --test_env=ASAN_SYMBOLIZER_PATH
test:asan_everything --test_lang_filters=-sh,-py
# Typical slowdown introduced by AddressSanitizer is 2x.
# See https://clang.llvm.org/docs/AddressSanitizer.html
test:asan_everything --test_timeout=120,600,1800,7200
test:asan_everything --test_timeout=150,750,2250,9000 # 2.5x

### LSan build. ###
build:lsan --copt -g
Expand Down Expand Up @@ -225,7 +225,7 @@ test:memcheck --test_tag_filters=-gurobi,-mosek,-snopt,-no_memcheck
test:memcheck --test_lang_filters=-sh,-py
# Slowdown factor can range from 5-100.
# See http://valgrind.org/info/about.html
test:memcheck --test_timeout=1200,6000,18000,72000 # 20x
test:memcheck --test_timeout=1500,7500,22500,90000 # 25x

### Memcheck everything build. ###
build:memcheck_everything --define=WITH_GUROBI=ON
Expand All @@ -239,7 +239,7 @@ test:memcheck_everything --run_under=//tools/dynamic_analysis:valgrind
test:memcheck_everything --test_lang_filters=-sh,-py
# Slowdown factor can range from 5-100.
# See http://valgrind.org/info/about.html
test:memcheck_everything --test_timeout=1200,6000,18000,72000 # 20x
test:memcheck_everything --test_timeout=1500,7500,22500,90000 # 25x

# Fast memcheck.
#
Expand All @@ -254,4 +254,4 @@ test:fastmemcheck --run_under=//tools/dynamic_analysis:valgrind
test:fastmemcheck --test_lang_filters=-sh,-py
# Slowdown factor can range from 5-100.
# See http://valgrind.org/info/about.html
test:fastmemcheck --test_timeout=1200,6000,18000,72000 # 20x
test:fastmemcheck --test_timeout=1500,7500,22500,90000 # 25x

0 comments on commit aa70a7d

Please sign in to comment.