From 66b662e2a4e949e015c514ce15864f68c4fd98c3 Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Thu, 25 Jan 2018 05:21:13 +0100 Subject: [PATCH] Skip asan testing when using await --- .travis.yml | 18 ------------------ tools/travis-ci.sh | 17 +++++++++++------ 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8192f3..9a0370f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,24 +59,6 @@ matrix: - WITH_NO_EXCEPTIONS=ON - WITH_AWAIT=ON - allow_failures: - - os: linux - compiler: clang - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-5.0 - packages: - - clang-5.0 - - cmake - - cmake-data - - ninja-build - env: - - COMPILER=clang++-5.0 - - WITH_NO_EXCEPTIONS=ON - - WITH_AWAIT=ON - install: - export CXX=$COMPILER - $CXX --version diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh index c57ce80..8c80ed2 100644 --- a/tools/travis-ci.sh +++ b/tools/travis-ci.sh @@ -47,16 +47,21 @@ function renew_build { } if [[ $CXX == *"clang"* ]]; then + LSAN_OPTIONS=verbosity=1:log_threads=1 ASAN_OPTIONS=abort_on_error=1 # Build the test suite with various sanitizers: - # - ASan (LSan): - echo "Building with address sanitizer..." - CMAKE_CXX_FLAGS="-fsanitize=address -fno-omit-frame-pointer" - renew_build + if [ $WITH_AWAIT != "ON" ]; then + # - ASan (LSan): + echo "Building with address sanitizer..." + CMAKE_CXX_FLAGS="-fsanitize=address -fno-omit-frame-pointer" + renew_build - ninja -j2 - ctest --verbose + ninja -j2 + ctest --verbose + else + echo "Skipping ASan testing because we build with coroutine support..."; + fi # - UBSan: echo "Building with undefined behaviour sanitizer..."