diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | scripts/travis.sh | 15 | ||||
| -rw-r--r-- | src/testdir/Makefile | 2 |
3 files changed, 16 insertions, 5 deletions
@@ -22,9 +22,7 @@ cmake: clean deps clean: rm -rf build - for file in lua mbyte mzscheme small tiny; do \ - rm -f src/testdir/$$file.vim; \ - done + cd src/testdir && make clean install: build/bin/nvim ${MAKE} -C build install diff --git a/scripts/travis.sh b/scripts/travis.sh index 90e8082f86..29cb923e75 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -3,5 +3,18 @@ export VALGRIND_CHECK=1 make cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$PWD/dist" make -make test > /dev/null 2>&1 +echo "Running tests with valgrind..." +if ! make test > /dev/null 2>&1; then + failed=$(ls src/testdir/valgrind.*) + if [ -n "$failed" ]; then + echo "Memory leak detected" >&2 + cat src/testdir/valgrind.* + else + echo "Failed tests:" >&2 + for t in src/testdir/*.failed; do + echo ${t%%.*} + done + fi + exit 2 +fi make install diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 1bf6f74ef8..98d92915ab 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -28,7 +28,7 @@ SCRIPTS := test1.out test2.out test3.out test4.out test5.out test6.out \ SCRIPTS_GUI := test16.out ifdef VALGRIND_CHECK -VALGRIND = valgrind --suppressions=../../.valgrind.supp --leak-check=yes --error-exitcode=1 --log-file=valgrind.$* +VALGRIND = valgrind --suppressions=../../.valgrind.supp --leak-check=yes --error-exitcode=111 --log-file=valgrind.$* endif ifdef TESTNUM |