Merge pull request #224 from badgerman/feature/lua-5-3

travis build now runs a full turn

CMakeLists.txt

@@ -8,6 +8,11 @@ project (eressea-server C)
 
 
 enable_testing()
+find_package (LibXml2)
+find_package (SQLite3)
+find_package (Curses)
+find_package (Lua REQUIRED)
+find_package (ToLua REQUIRED)
 
 INCLUDE (CheckIncludeFiles)
 INCLUDE (CheckSymbolExists)
@@ -57,13 +62,6 @@ CONFIGURE_FILE (
 INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/include)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_AUTOCONF")
 
-
-find_package (LibXml2)
-find_package (SQLite3)
-find_package (Curses)
-find_package (Lua REQUIRED)
-find_package (ToLua REQUIRED)
-
 add_subdirectory (cutest)
 add_subdirectory (crypto)
 add_subdirectory (cJSON)

cmake

@@ -1 +1 @@
-Subproject commit cd779ba36efb4045a040af170588a8dfe496d7b9
+Subproject commit ce0a1c882fa44b882c29cc8c68012295328dc352

s/cmake-init

@@ -10,6 +10,7 @@ done
 
 [ -z $BUILD ] && BUILD=Debug
 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"
@@ -33,7 +34,20 @@ if [ -d $HOME/usr ]; then
   PREFIX_PATH=$HOME/usr:$HOME/usr/local:$PREFIX_PATH
 fi
 
-cmake .. \
+if [ -z $PC_LUA ] && [ -e /opt/include/lua.h ]; then
+PC_LUA=/opt/include
+fi
+if [ -z $PC_TOLUA ] && [ -e /opt/include/tolua.h ]; then
+PC_TOLUA=/opt/include
+fi
+if [ ! -z $PC_TOLUA ]; then
+PC_ARGS="$PC_ARGS -DPC_TOLUA_INCLUDEDIR=$PC_TOLUA/include -DPC_TOLUA_LIBDIR=$PC_TOLUA/lib"
+fi
+if [ ! -z $PC_LUA ]; then
+PC_ARGS="$PC_ARGS -DPC_LUA_INCLUDEDIR=$PC_LUA/include -DPC_LUA_LIBDIR=$PC_LUA/lib"
+fi
+
+cmake .. $PC_ARGS \
  -DCMAKE_MODULE_PATH=$PWD/../cmake/Modules \
  -DCMAKE_BUILD_TYPE=$BUILD \
  -DCMAKE_LIBRARY_PATH=$LIBRARY_PATH \

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

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
+}