Merge branch 'develop' of github.com:ennorehling/eressea into develop

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "lunit"]
-	path = lunit
-	url = https://github.com/ennorehling/lunit.git
 [submodule "dlmalloc"]
 	path = dlmalloc
 	url = https://github.com/ennorehling/dlmalloc.git

.travis.yml

@@ -17,6 +17,7 @@ addons:
       - valgrind
       - cppcheck
       - shellcheck
+      - luarocks
 os:
   - linux
 notifications:

clibs

@@ -1 +1 @@
-Subproject commit abe774f70265de14ea7f5e530518ca130562a9c9
+Subproject commit 484fbf23e34f6844f1c4e3f685bb6c53cadf5bfe

lunit

@@ -1 +0,0 @@
-Subproject commit 155c96594435413b4f704eb17558ea0b70631bad

s/cmake-init

@@ -125,6 +125,7 @@ TOLUA
 else
  echo "tolua is $path"
 fi
+luarocks --local install lunitx
 unset path
 
 set -e

s/runtests

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-
+eval $(luarocks path)
 ROOT=$(git rev-parse --show-toplevel)
 [ -z $BUILD ] && BUILD=Debug ; export BUILD
 

scripts/eressea/path.lua

@@ -3,4 +3,3 @@ if config.paths ~= nil then
         package.path = package.path .. ';' .. path .. '/?.lua;' .. path .. '/?/init.lua'
     end
 end
--- print(package.path)

scripts/run-tests-e2.lua

@@ -4,18 +4,16 @@
 path = 'scripts'
 if config.install then
     path = config.install .. '/' .. path
-    package.path = package.path .. ';' .. config.install .. '/lunit/?.lua'
-    --needed to find lunit if not run from eressea root. Needs right [lua] install setting in eressea.ini (point to eressea root from the start folder)
 end
 package.path = package.path .. ';' .. path .. '/?.lua;' .. path .. '/?/init.lua'
 
 config.rules = 'e2'
 
+lunit = require 'lunit'
 require 'eressea'
 require 'eressea.xmlconf'
 require 'eressea.path'
 require 'tests.e2'
-require 'lunit'
 
 rng.inject(0)
 eressea.settings.set("rules.food.flags", "4")

scripts/run-tests-e3.lua

@@ -4,18 +4,16 @@
 path = 'scripts'
 if config.install then
     path = config.install .. '/' .. path
-    package.path = package.path .. ';' .. config.install .. '/lunit/?.lua'
-    --needed to find lunit if not run form eressea root. Needs right [lua] install setting in eressea.ini (point to eressea root from the start folder)
 end
 package.path = package.path .. ';' .. path .. '/?.lua;' .. path .. '/?/init.lua'
 
 config.rules = 'e3'
 
+lunit = require 'lunit'
 require 'eressea'
 require 'eressea.path'
 require 'eressea.xmlconf'
 require 'tests.e3'
-require 'lunit'
 
 rng.inject(0)
 eressea.settings.set("rules.alliances", "0")

scripts/run-tests.lua

@@ -4,14 +4,12 @@
 path = 'scripts'
 if config.install then
     path = config.install .. '/' .. path
-    package.path = package.path .. ';' .. config.install .. '/lunit/?.lua' 
-    --needed to find lunit if not run form eressea root. Needs right [lua] install setting in eressea.ini (point to eressea root from the start folder)
 end
 package.path = package.path .. ';' .. path .. '/?.lua;' .. path .. '/?/init.lua'
 
+lunit = require 'lunit'
 require 'eressea'
 require 'eressea.path'
 require 'tests'
-require 'lunit'
 result = lunit.main()
 return result.errors + result.failed