summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml19
1 files changed, 12 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index c2bfdb2e3..94ee9512b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,13 +17,13 @@ matrix:
compiler: clang
addons: *clang36
-# - env: COMPILER_VERSION=3.6 COMPILER_FLAGS="-fsanitize=address"
-# compiler: clang
-# addons: *clang36
-#
-# - env: COMPILER_VERSION=3.6 COMPILER_FLAGS="-fsanitize=thread"
-# compiler: clang
-# addons: *clang36
+ - env: COMPILER_VERSION=3.6 COMPILER_FLAGS="-fsanitize=address"
+ compiler: clang
+ addons: *clang36
+
+ - env: COMPILER_VERSION=3.6 COMPILER_FLAGS="-fsanitize=thread"
+ compiler: clang
+ addons: *clang36
- env: COMPILER_VERSION=5
compiler: gcc
@@ -32,6 +32,11 @@ matrix:
sources: ['ubuntu-toolchain-r-test']
packages: ['cmake', 'g++-5']
+ allow_failures:
+ - env: COMPILER_VERSION=3.6 COMPILER_FLAGS="-fsanitize=address"
+ compiler: clang
+ addons: *clang36
+
before_install:
- export CC="${CC}-${COMPILER_VERSION}"
- export CXX="${CXX}-${COMPILER_VERSION}"