summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2016-01-15 10:07:07 -0800
committerAlon Zakai <alonzakai@gmail.com>2016-01-15 10:07:07 -0800
commit1abc08f121413b671d3890065c63c479f6a39b82 (patch)
tree47dff4bdb56e6a20b869bfeb380569bbd2d250ae
parent5192fc38ca377939b4411f52e73e1a4bc3127d2d (diff)
parent3d3d3ccd7214c09cf6c2fe96567557b7d9580dfb (diff)
downloadbinaryen-1abc08f121413b671d3890065c63c479f6a39b82.tar.gz
binaryen-1abc08f121413b671d3890065c63c479f6a39b82.tar.bz2
binaryen-1abc08f121413b671d3890065c63c479f6a39b82.zip
Merge pull request #106 from WebAssembly/jfbastien-patch-1
Travis: run asan / tsan, but allow asan to fail
-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}"