Skip to content

Commit

Permalink
Revert "Downgrade to clang-4.0 to avoid false-positive warnings from …
Browse files Browse the repository at this point in the history
…clang" [skip appveyor] (neovim#10487)

This reverts commit 2cbac71.
  • Loading branch information
blueyed authored Jul 18, 2019
1 parent ba7ec99 commit a04e0c8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ 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).
Expand Down Expand Up @@ -62,7 +61,7 @@ addons:
- autoconf
- automake
- build-essential
- clang-4.0
- clang
- cmake
- cscope
- gcc-multilib
Expand All @@ -88,12 +87,11 @@ jobs:
- stage: baseline
name: clang-asan
os: linux
compiler: clang-4.0
compiler: clang
# Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6
env:
- CLANG_SANITIZER=ASAN_UBSAN
- CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
- ASAN_SYMBOLIZE=asan_symbolize-4.0
- *common-job-env
- name: gcc-functionaltest-lua
os: linux
Expand Down
2 changes: 1 addition & 1 deletion ci/common/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,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
}

Expand Down

0 comments on commit a04e0c8

Please sign in to comment.