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

hard-coded search for valgrind

This commit is contained in:
Enno Rehling 2021-04-28 20:02:24 +02:00
parent 9cee6a8115
commit f158dab855
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
RUN_TESTS=$ROOT/$BUILD/eressea/eressea
if [ "$1" = "-V" ]; then
VALGRIND=$(which valgrind)
if [ -n "$VALGRIND" ]; then
SUPP=$ROOT/share/ubuntu-12_04.supp
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"
fi
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"
fi
if [ ! -e $ROOT/$BUILD ]; then

6
s/travis-build
View File

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