diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | scripts/travis.sh | 9 | ||||
| -rw-r--r-- | src/testdir/Makefile | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index cb54bbcc09..cc8ea7a445 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,5 @@ language: c script: ./scripts/travis.sh +before_install: + - sudo apt-get update + - sudo apt-get install valgrind diff --git a/scripts/travis.sh b/scripts/travis.sh index 5662f5f06d..ff0a625d6e 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -1,12 +1,11 @@ -#!/bin/sh +#!/bin/sh -e export VALGRIND_CHECK=1 -make cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$PWD/dist" || exit 1 -make || exit 1 +make cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$PWD/dist" +make echo "Running tests with valgrind..." if ! make test > /dev/null 2>&1; then - failed=$(ls src/testdir/valgrind.*) - if [ -n "$failed" ]; then + if ls src/testdir/valgrind.* > /dev/null 2>&1; then echo "Memory leak detected" >&2 cat src/testdir/valgrind.* else diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 98d92915ab..f096cb5b70 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=111 --log-file=valgrind.$* +VALGRIND = valgrind --suppressions=../../.valgrind.supp --leak-check=full --error-exitcode=111 --log-file=valgrind.$* endif ifdef TESTNUM |