From ff3fdb62cd39a692dc3394ae580dd1202274db44 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Wed, 17 Jun 2015 07:29:22 +0200
Subject: [PATCH] enable valgrind suppressions for QA previews

---
 CMakeLists.txt                     | 2 +-
 s/preview                          | 3 ++-
 s/runtests                         | 1 +
 s/travis-build                     | 5 +++--
 {tests => share}/ubuntu-12_04.supp | 0
 5 files changed, 7 insertions(+), 4 deletions(-)
 rename {tests => share}/ubuntu-12_04.supp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 800851655..004248570 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,4 +73,4 @@ add_subdirectory (src eressea)
 install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.xml")
 install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.json")
 install(DIRECTORY scripts DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.lua")
-
+install(DIRECTORY share DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/s/preview b/s/preview
index 12752738f..bb336a5f8 100755
--- a/s/preview
+++ b/s/preview
@@ -80,10 +80,11 @@ ln -f $LIVE/data/$turn.dat data/
 rm -rf reports
 mkdir -p reports
 
+SUPP="$SERVER/share/ubuntu-12_04.supp"
 SERVER="$SOURCE/build-x86_64-gcc-Debug/eressea/eressea"
 VALGRIND=$(which valgrind)
 if [ ! -z $VALGRIND ]; then
-SERVER="$VALGRIND --leak-check=no $SERVER"
+SERVER="$VALGRIND --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER"
 fi
 $SERVER -v$verbose -t$turn -re$game $SOURCE/scripts/run-turn.lua
 let turn=$turn+1
diff --git a/s/runtests b/s/runtests
index eaf4ba8d8..df0777ca9 100755
--- a/s/runtests
+++ b/s/runtests
@@ -7,6 +7,7 @@ while [ ! -d $ROOT/.git ]; do
 done
 
 MACHINE=`uname -m`
+[ -z "$CC" ] && [ ! -z `which clang` ] && CC="clang"
 [ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc"
 [ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc"
 [ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc"
diff --git a/s/travis-build b/s/travis-build
index 29efda196..b34340266 100755
--- a/s/travis-build
+++ b/s/travis-build
@@ -2,6 +2,7 @@
 
 set -e
 ROOT=`pwd`
+SUPP=../share/ubuntu-12_04.supp
 MACHINE=`uname -m`
 [ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc"
 [ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc"
@@ -25,13 +26,13 @@ make
 test_valgrind_report () {
 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
+valgrind --suppressions=$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
+valgrind --suppressions=$SUPP --error-exitcode=1 $BUILD/eressea/eressea -v0 -t184 ../scripts/run-turn.lua
 }
 
 test_unittests() {
diff --git a/tests/ubuntu-12_04.supp b/share/ubuntu-12_04.supp
similarity index 100%
rename from tests/ubuntu-12_04.supp
rename to share/ubuntu-12_04.supp