diff options
| -rw-r--r-- | ci/common/build.sh | 7 | ||||
| -rw-r--r-- | ci/common/test.sh | 8 | ||||
| -rwxr-xr-x | src/nvim/testdir/runnvim.sh | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/ci/common/build.sh b/ci/common/build.sh index bdbe012ca6..654dd8aa66 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -84,12 +84,11 @@ build_nvim() { fi # Invoke nvim to trigger *San early. - if ! (bin/nvim --version && bin/nvim -u NONE -e -c ':qall') ; then - asan_check "${LOG_DIR}" + if ! (bin/nvim --version && bin/nvim -u NONE -e -cq | cat -A) ; then + check_sanitizer "${LOG_DIR}" exit 1 fi - asan_check "${LOG_DIR}" - + check_sanitizer "${LOG_DIR}" cd "${TRAVIS_BUILD_DIR}" } diff --git a/ci/common/test.sh b/ci/common/test.sh index fb2dcc077e..0233d62c96 100644 --- a/ci/common/test.sh +++ b/ci/common/test.sh @@ -80,8 +80,8 @@ valgrind_check() { check_logs "${1}" "valgrind-*" } -asan_check() { - if test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then +check_sanitizer() { + if test -n "${CLANG_SANITIZER}"; then check_logs "${1}" "*san.*" fi } @@ -104,7 +104,7 @@ run_functionaltests() {( fail 'functionaltests' F 'Functional tests failed' fi submit_coverage functionaltest - asan_check "${LOG_DIR}" + check_sanitizer "${LOG_DIR}" valgrind_check "${LOG_DIR}" check_core_dumps exit_suite @@ -118,7 +118,7 @@ run_oldtests() {( fail 'oldtests' F 'Legacy tests failed' fi submit_coverage oldtest - asan_check "${LOG_DIR}" + check_sanitizer "${LOG_DIR}" valgrind_check "${LOG_DIR}" check_core_dumps exit_suite diff --git a/src/nvim/testdir/runnvim.sh b/src/nvim/testdir/runnvim.sh index 43556f3ad3..249b89d04e 100755 --- a/src/nvim/testdir/runnvim.sh +++ b/src/nvim/testdir/runnvim.sh @@ -64,7 +64,7 @@ main() {( fi valgrind_check . if test -n "$LOG_DIR" ; then - asan_check "$LOG_DIR" + check_sanitizer "$LOG_DIR" fi check_core_dumps if test "$FAILED" = 1 ; then |