diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | ci/common/test.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 7674ecb0c2..d8ce0544af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,7 @@ env: - ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1:log_path=$LOG_DIR/asan" - TSAN_OPTIONS="log_path=$LOG_DIR/tsan" - UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan" + - ASAN_SYMBOLIZE=asan_symbolize # Environment variables for Valgrind. - VALGRIND_LOG="$LOG_DIR/valgrind-%p.log" # If this file exists, the cache is valid (compile was successful). @@ -50,11 +51,12 @@ jobs: include: - stage: normal builds os: linux - compiler: clang + compiler: clang-4.0 env: > CLANG_SANITIZER=ASAN_UBSAN # Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6 CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON" + ASAN_SYMBOLIZE=asan_symbolize-4.0 sudo: true - os: linux compiler: gcc @@ -100,7 +102,7 @@ addons: - autoconf - automake - build-essential - - clang + - clang-4.0 - cmake - cscope - g++-multilib diff --git a/ci/common/test.sh b/ci/common/test.sh index a6afd1df4c..f1c5454e3f 100644 --- a/ci/common/test.sh +++ b/ci/common/test.sh @@ -83,7 +83,7 @@ valgrind_check() { asan_check() { if test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then - check_logs "${1}" "*san.*" | asan_symbolize + check_logs "${1}" "*san.*" | $ASAN_SYMBOLIZE fi } |