From 93a45ccc25f2e3f985b631b70e321414b4209d53 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Wed, 1 Oct 2014 19:30:13 -0300 Subject: [PATCH] travis: Fix clang-asan to always display memory errors Always check the logs in case of test failures(which would happen when ASAN finds an error since it will abort Nvim). Also run the 'oldtest' target from the gcc-32.sh script --- .ci/clang-asan.sh | 8 ++++++-- .ci/gcc-32.sh | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.ci/clang-asan.sh b/.ci/clang-asan.sh index 5019466fcf..0dff61f297 100644 --- a/.ci/clang-asan.sh +++ b/.ci/clang-asan.sh @@ -26,15 +26,19 @@ export UBSAN_OPTIONS="log_path=$tmpdir/ubsan" # not sure if this works install_dir="$(pwd)/dist" $MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DCMAKE_INSTALL_PREFIX=$install_dir -DUSE_GCOV=ON" -$MAKE_CMD test +if ! $MAKE_CMD test; then + asan_check "$tmpdir" + exit 1 +fi asan_check "$tmpdir" + if ! $MAKE_CMD oldtest; then reset asan_check "$tmpdir" exit 1 fi - asan_check "$tmpdir" + coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.' $MAKE_CMD install diff --git a/.ci/gcc-32.sh b/.ci/gcc-32.sh index c0e9dcd839..ec51cfab69 100644 --- a/.ci/gcc-32.sh +++ b/.ci/gcc-32.sh @@ -28,3 +28,4 @@ CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \ $MAKE_CMD CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" unittest $MAKE_CMD test +$MAKE_CMD oldtest