diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-09-03 01:45:59 -0600 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-09-03 01:45:59 -0600 |
| commit | db376c8654c18701c111f7e789f9f2bd0ec8d689 (patch) | |
| tree | 79bedaca36ea17dc3124f2bfacd87926bed85b78 | |
| parent | 183999c0020a33cef8f6e068d18fb5d281015a2b (diff) | |
| download | google-benchmark-db376c8654c18701c111f7e789f9f2bd0ec8d689.tar.gz | |
Tweak TSAN flags
| -rw-r--r-- | .travis-libcxx-setup.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis-libcxx-setup.sh b/.travis-libcxx-setup.sh index ac295a9..1b6b585 100644 --- a/.travis-libcxx-setup.sh +++ b/.travis-libcxx-setup.sh @@ -13,7 +13,7 @@ git clone --depth=1 https://github.com/llvm-mirror/libcxxabi.git llvm-source/pro # Build and install libc++ (Use unstable ABI for better sanitizer coverage) mkdir llvm-build && cd llvm-build cmake -DCMAKE_C_COMPILER=${C_COMPILER} -DCMAKE_CXX_COMPILER=${COMPILER} \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr \ -DLIBCXX_ABI_UNSTABLE=ON \ -DLLVM_USE_SANITIZER=${LIBCXX_SANITIZER} \ ../llvm-source diff --git a/.travis.yml b/.travis.yml index c8fde22..19c68dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,9 +72,9 @@ matrix: packages: clang-3.8 env: - - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=Debug + - COMPILER=clang++-3.8 C_COMPILER=clang-3.8 BUILD_TYPE=RelWithDebInfo - LIBCXX_BUILD=1 LIBCXX_SANITIZER=Thread - - EXTRA_FLAGS="-stdlib=libc++ -g -O2 -fno-omit-frame-pointer -fsanitize=thread" + - EXTRA_FLAGS="-stdlib=libc++ -g -O2 -fno-omit-frame-pointer -fsanitize=thread -fno-sanitize-recover=all" before_script: - if [ -n "${LIBCXX_BUILD}" ]; then |