Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2016-01-17 16:23:01 +01:00
commit 52e517b98d
2 changed files with 51 additions and 1 deletions

View File

@ -81,7 +81,7 @@ ln -f $LIVE/data/$turn.dat data/
rm -rf reports rm -rf reports
mkdir -p reports mkdir -p reports
SUPP="$SOURCE/share/ubuntu-12_04.supp" SUPP="$SOURCE/share/debian-7_8.supp"
SERVER="$SOURCE/Debug/eressea/eressea" SERVER="$SOURCE/Debug/eressea/eressea"
VALGRIND=$(which valgrind) VALGRIND=$(which valgrind)
if [ ! -z $VALGRIND ]; then if [ ! -z $VALGRIND ]; then

50
share/debian-7_8.supp Normal file
View File

@ -0,0 +1,50 @@
{
stpncpy sse3
Memcheck:Cond
obj:/lib/x86_64-linux-gnu/libc-2.13.so
fun:md5_crypt_r
fun:md5_crypt
fun:password_hash_i
fun:password_verify
fun:checkpasswd
fun:factionorders
fun:readorders
fun:tolua_read_orders
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
}
{
stpncpy sse3
Memcheck:Value8
obj:/lib/x86_64-linux-gnu/libc-2.13.so
fun:md5_crypt_r
fun:md5_crypt
fun:password_hash_i
fun:password_verify
fun:checkpasswd
fun:factionorders
fun:readorders
fun:tolua_read_orders
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
}
{
strtod sse
Memcheck:Addr8
fun:__GI___strncasecmp_l
fun:____strtod_l_internal
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
fun:lua_isnumber
fun:class_index_event
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
obj:/usr/lib/x86_64-linux-gnu/liblua5.2.so.0.0.0
}