aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-07-18 08:49:37 +0200
committerGitHub <noreply@github.com>2019-07-18 08:49:37 +0200
commita04e0c8db2d7b9e7abd0dbfbe06f51904f3a32af (patch)
treef5e8d88f67f7d1115b7a4aa0e97a56118795d9f1
parentba7ec994ae44499cb0633b0c9d55636f94d2a524 (diff)
downloadrneovim-a04e0c8db2d7b9e7abd0dbfbe06f51904f3a32af.tar.gz
rneovim-a04e0c8db2d7b9e7abd0dbfbe06f51904f3a32af.tar.bz2
rneovim-a04e0c8db2d7b9e7abd0dbfbe06f51904f3a32af.zip
Revert "Downgrade to clang-4.0 to avoid false-positive warnings from clang" [skip appveyor] (#10487)
This reverts commit 2cbac719c3eba8ea5826e16912126d70222911ed.
-rw-r--r--.travis.yml6
-rw-r--r--ci/common/test.sh2
2 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 0f6924dc63..94d691b5f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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).
@@ -62,7 +61,7 @@ addons:
- autoconf
- automake
- build-essential
- - clang-4.0
+ - clang
- cmake
- cscope
- gcc-multilib
@@ -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
diff --git a/ci/common/test.sh b/ci/common/test.sh
index e25af4d56c..c184064236 100644
--- a/ci/common/test.sh
+++ b/ci/common/test.sh
@@ -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
}