3 files changed, 8 insertions, 9 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1
index 42066c462b..d533d7b4e0 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -139,7 +139,7 @@ if ($uploadToCodecov) {
 # But would break functionaltests, where its `more` would be used then.
 $OldPath = $env:PATH
 $env:PATH = "C:\msys64\usr\bin;$env:PATH"
-& "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1
+& "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1 ; exitIfFailed
 $env:PATH = $OldPath
 
 if ($uploadToCodecov) {
diff --git a/ci/common/build.sh b/ci/common/build.sh
index bdbe012ca6..8e9b2f8ebb 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 -vet) ; 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