hard-coded search for valgrind

travis: use bionic, do not run valgrind
This commit is contained in:
Enno Rehling 2021-04-28 20:02:24 +02:00
parent ff7cd7d20d
commit 4448cd607c
3 changed files with 8 additions and 8 deletions

View File

@ -1,6 +1,6 @@
sudo: false
language: c
dist: focal
dist: bionic
compiler:
- gcc
- clang
@ -16,7 +16,6 @@ addons:
- libexpat1-dev
- libiniparser-dev
- libcjson-dev
- valgrind
- cppcheck
- shellcheck
- luarocks

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

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