diff options
| author | Daniel Hahler <git@thequod.de> | 2019-08-14 23:21:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-14 23:21:41 +0200 |
| commit | 9bf3fab60b7816274ff3b7131a793b5b4f2f5f3c (patch) | |
| tree | 384d9e9938b27b2e3e1ffc6f332eb93af02f7490 | |
| parent | 48b43352b052392418888c5a10c7802e7388a24a (diff) | |
| parent | ae31de32ee49951e4d107043f88dbfed07473c47 (diff) | |
| download | rneovim-9bf3fab60b7816274ff3b7131a793b5b4f2f5f3c.tar.gz rneovim-9bf3fab60b7816274ff3b7131a793b5b4f2f5f3c.tar.bz2 rneovim-9bf3fab60b7816274ff3b7131a793b5b4f2f5f3c.zip | |
Merge pull request #10779 from blueyed/ci-homebrew-no-update
ci: fix Travis
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | ci/common/build.sh | 2 | ||||
| -rw-r--r-- | src/.tsan-suppressions | 2 | ||||
| -rw-r--r-- | src/nvim/README.md | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f234c89c26..9d8a2ea59b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ env: -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/i386-linux-gnu.toolchain.cmake" # Environment variables for Clang sanitizers. - ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1:log_path=$LOG_DIR/asan" - - TSAN_OPTIONS="log_path=$LOG_DIR/tsan" + - TSAN_OPTIONS="log_path=$LOG_DIR/tsan:suppressions=$TRAVIS_BUILD_DIR/src/.tsan-suppressions" - UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan" # Environment variables for Valgrind. - VALGRIND_LOG="$LOG_DIR/valgrind-%p.log" @@ -76,7 +76,7 @@ addons: - valgrind - xclip homebrew: - update: true + update: false packages: - ccache - ninja diff --git a/ci/common/build.sh b/ci/common/build.sh index 654dd8aa66..8e9b2f8ebb 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -84,7 +84,7 @@ build_nvim() { fi # Invoke nvim to trigger *San early. - if ! (bin/nvim --version && bin/nvim -u NONE -e -cq | cat -A) ; then + if ! (bin/nvim --version && bin/nvim -u NONE -e -cq | cat -vet) ; then check_sanitizer "${LOG_DIR}" exit 1 fi diff --git a/src/.tsan-suppressions b/src/.tsan-suppressions new file mode 100644 index 0000000000..c004a468a6 --- /dev/null +++ b/src/.tsan-suppressions @@ -0,0 +1,2 @@ +# Ref: https://github.com/neovim/neovim/pull/10591#issuecomment-521248233 +race:starting diff --git a/src/nvim/README.md b/src/nvim/README.md index 3c956cb2e9..64d729cc8b 100644 --- a/src/nvim/README.md +++ b/src/nvim/README.md @@ -63,7 +63,7 @@ Enable the sanitizer(s) via these environment variables: export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer export MSAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer - export TSAN_OPTIONS="external_symbolizer_path=/usr/lib/llvm-5.0/bin/llvm-symbolizer log_path=${HOME}/logs/tsan" + export TSAN_OPTIONS="log_path=${HOME}/logs/tsan:suppressions=${NVIM_PATH}/src/.tsan-suppressions" Logs will be written to `${HOME}/logs/*san.PID`. |