Modify travis configuration to install valgrind

This should fix previous build failures
This commit is contained in:
Thiago de Arruda 2014-02-26 22:23:51 -03:00
parent a81d25e6e4
commit a2ce1df772
3 changed files with 8 additions and 6 deletions

View File

@ -1,2 +1,5 @@
language: c
script: ./scripts/travis.sh
before_install:
- sudo apt-get update
- sudo apt-get install valgrind

View File

@ -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

View File

@ -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