Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

hard-coded search for valgrind

Browse source
This commit is contained in:
Enno Rehling 2021-04-28 20:02:24 +02:00
parent c87b6a8fd3
commit 4608f720ea
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
s/runtests
View file

@ -8,12 +8,9 @@ export LUA_PATH="$ROOT/scripts/?.lua;$LUA_PATH"
UNIT_TESTS=$ROOT/$BUILD/eressea/test_eressea UNIT_TESTS=$ROOT/$BUILD/eressea/test_eressea
RUN_TESTS=$ROOT/$BUILD/eressea/eressea RUN_TESTS=$ROOT/$BUILD/eressea/eressea
if [ "$1" = "-V" ]; then if [ "$1" = "-V" ]; then
VALGRIND=$(which valgrind)
if [ -n "$VALGRIND" ]; then
SUPP=$ROOT/share/ubuntu-12_04.supp SUPP=$ROOT/share/ubuntu-12_04.supp
UNIT_TESTS="$VALGRIND --quiet --suppressions=$SUPP --error-exitcode=1 --leak-check=no $UNIT_TESTS" UNIT_TESTS="valgrind --quiet --suppressions=$SUPP --error-exitcode=1 --leak-check=no $UNIT_TESTS"
RUN_TESTS="$VALGRIND --quiet --suppressions=$SUPP --error-exitcode=1 --leak-check=no $RUN_TESTS" RUN_TESTS="valgrind --quiet --suppressions=$SUPP --error-exitcode=1 --leak-check=no $RUN_TESTS"
fi
fi fi
if [ ! -e $ROOT/$BUILD ]; then if [ ! -e $ROOT/$BUILD ]; then

4
s/travis-build
View file

@ -43,6 +43,10 @@ luarocks install lunitx --local
eval $(luarocks path) eval $(luarocks path)
export LUA_PATH="$ROOT/scripts/?.lua;$LUA_PATH" export LUA_PATH="$ROOT/scripts/?.lua;$LUA_PATH"
echo $LUA_PATH echo $LUA_PATH
if [ -e /usr/bin/valgrind ]; then
s/runtests -V s/runtests -V
else
s/runtests
fi
integration_tests integration_tests