From c30a9bd524fd1e1b516eba6ebe5c33a532d73c7e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 14 Oct 2014 23:10:00 +0200 Subject: [PATCH 1/4] travis debugging --- s/travis-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s/travis-build b/s/travis-build index 5a942fbba..4aee66f3b 100755 --- a/s/travis-build +++ b/s/travis-build @@ -7,4 +7,4 @@ cd build && cmake .. \ -DCMAKE_BUILD_TYPE=Debug .. && \ make && cd .. && build/eressea/test_eressea && -build/eressea/eressea -v0 scripts/run-tests.lua +build/eressea/eressea -v1 scripts/run-tests.lua From e1b1f9e03fbf7b1eb0a2aede0d9be23cdf964f9f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 14 Oct 2014 23:18:01 +0200 Subject: [PATCH 2/4] fix eressea.ini for travis --- s/travis-build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/s/travis-build b/s/travis-build index 4aee66f3b..47c50d9f9 100755 --- a/s/travis-build +++ b/s/travis-build @@ -1,6 +1,10 @@ #!/bin/sh -ln -sf conf/eressea.ini +if [ ! -e eressea.ini ]; then +cp conf/eressea.ini . +build/iniparser/inifile eressea.ini add lua:paths lunit:scripts +fi + [ -d build ] || mkdir build cd build && cmake .. \ -DCMAKE_MODULE_PATH=$PWD/../cmake/Modules \ From 9742ee265f1bd9ddf5d136fbcaae677e8f558b06 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 14 Oct 2014 23:22:02 +0200 Subject: [PATCH 3/4] fix eressea.ini for travis, again --- s/travis-build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/s/travis-build b/s/travis-build index 47c50d9f9..88b95d850 100755 --- a/s/travis-build +++ b/s/travis-build @@ -1,14 +1,16 @@ #!/bin/sh +inifile() { if [ ! -e eressea.ini ]; then cp conf/eressea.ini . build/iniparser/inifile eressea.ini add lua:paths lunit:scripts fi +} [ -d build ] || mkdir build cd build && cmake .. \ -DCMAKE_MODULE_PATH=$PWD/../cmake/Modules \ -DCMAKE_BUILD_TYPE=Debug .. && \ -make && cd .. && +make && cd .. && inifile && build/eressea/test_eressea && build/eressea/eressea -v1 scripts/run-tests.lua From 352d947770295c005ac85c1217bb7e2617d40c08 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 14 Oct 2014 23:25:54 +0200 Subject: [PATCH 4/4] debugging done, no need to be so verbose --- s/travis-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s/travis-build b/s/travis-build index 88b95d850..b08a5a890 100755 --- a/s/travis-build +++ b/s/travis-build @@ -13,4 +13,4 @@ cd build && cmake .. \ -DCMAKE_BUILD_TYPE=Debug .. && \ make && cd .. && inifile && build/eressea/test_eressea && -build/eressea/eressea -v1 scripts/run-tests.lua +build/eressea/eressea -v0 scripts/run-tests.lua