diff --git a/cmake b/cmake index 2e4a409c0..ce0a1c882 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 2e4a409c0b2b6b1150ea424289552a199b374c7a +Subproject commit ce0a1c882fa44b882c29cc8c68012295328dc352 diff --git a/s/travis-build b/s/travis-build index 4724d04b0..29efda196 100755 --- a/s/travis-build +++ b/s/travis-build @@ -23,18 +23,24 @@ make } test_valgrind_report () { -cd tests +cd $ROOT/tests ln -sf ../scripts/config.lua valgrind --suppressions=ubuntu-12_04.supp --error-exitcode=1 $BUILD/eressea/eressea -v0 -t184 ../scripts/reports.lua } +test_valgrind_turn () { +cd $ROOT/tests +ln -sf ../scripts/config.lua +valgrind --suppressions=ubuntu-12_04.supp --error-exitcode=1 $BUILD/eressea/eressea -v0 -t184 ../scripts/run-turn.lua +} + test_unittests() { $BUILD/eressea/test_eressea } cleanup() { cd $ROOT/tests -rm -rf reports score eressea.log* config.lua +rm -rf reports score eressea.log* config.lua data/185.dat datum passwd parteien parteien.full turn } test_server() { @@ -59,5 +65,6 @@ build test_unittests test_server test_valgrind_report +test_valgrind_turn cleanup diff --git a/tests/ubuntu-12_04.supp b/tests/ubuntu-12_04.supp index 29862fa2b..3d6ae2974 100644 --- a/tests/ubuntu-12_04.supp +++ b/tests/ubuntu-12_04.supp @@ -1,3 +1,4 @@ +# old zlib version { zlib1g-dev-1:1.2.3.4.dfsg Memcheck:Cond @@ -14,3 +15,23 @@ fun:read_xml fun:init_data } + +# https://sourceware.org/bugzilla/show_bug.cgi?id=14404 +{ + glibc-bug-14404-1 + Memcheck:Addr8 + fun:__GI___strncasecmp_l + fun:____strtod_l_internal +} +{ + glibc-bug-14404-2 + Memcheck:Cond + fun:__GI___strncasecmp_l + fun:____strtod_l_internal +} +{ + glibc-bug-14404-3 + Memcheck:Value8 + fun:__GI___strncasecmp_l + fun:____strtod_l_internal +}