Merge pull request CleverRaven#27686 from jbytheway/disable_slow_sani…

…tizer_tests [WIP] Disable slow sanitizer tests
mlangsdorf · Jan 18, 2019 · da26e97 · da26e97
2 parents 8c5fe5d + d77bef9
commit da26e97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -159,7 +159,7 @@ jobs:
           sources: [*apt_sources, llvm-toolchain-trusty-5.0]
 
     # Clang 6.0
-    - env: CLANG=clang++-6.0 CXXFLAGS=-Wno-error=unused-command-line-argument SANITIZE=address
+    - env: CLANG=clang++-6.0 CXXFLAGS=-Wno-error=unused-command-line-argument SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag"
       dist: trusty
       compiler: clang
       addons: &clang60

diff --git a/build-scripts/build.sh b/build-scripts/build.sh
@@ -6,7 +6,7 @@ set -ex
 
 function run_tests
 {
-    $WINE "$@" -d yes -r cata --rng-seed time
+    $WINE "$@" -d yes -r cata --rng-seed time $EXTRA_TEST_OPTS
 }
 
 if [ -n "$CMAKE" ]