diff options
| -rwxr-xr-x | scripts/travis.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index c956d8b760..5662f5f06d 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -1,11 +1,11 @@ -#!/bin/sh -e +#!/bin/sh export VALGRIND_CHECK=1 -make cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$PWD/dist" -make +make cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$PWD/dist" || exit 1 +make || exit 1 echo "Running tests with valgrind..." if ! make test > /dev/null 2>&1; then - failed=$(ls src/testdir/valgrind.* || true) + failed=$(ls src/testdir/valgrind.*) if [ -n "$failed" ]; then echo "Memory leak detected" >&2 cat src/testdir/valgrind.* @@ -15,6 +15,6 @@ if ! make test > /dev/null 2>&1; then echo ${t%%.*} done fi - exit 2 + exit 1 fi make install |