Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

abort tests when non-zero exit-code is returned, fix GiveRestriction for pool tests

This commit is contained in:
Enno Rehling 2015-05-21 11:05:24 +02:00
parent 88f454e1f7
commit 1c4778e3ef
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
s/runtests
View File

@ -15,7 +15,7 @@ if [ ! -d $ROOT/$BIN_DIR ]; then
exit exit
fi fi
$ROOT/$BIN_DIR/eressea/test_eressea $ROOT/$BIN_DIR/eressea/test_eressea || exit $?
cd $ROOT cd $ROOT
[ -e eressea.ini ] || ln -sf conf/eressea.ini [ -e eressea.ini ] || ln -sf conf/eressea.ini
$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests.lua || exit $? $ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests.lua || exit $?

1
scripts/tests/pool.lua
View File

@ -8,6 +8,7 @@ function setup()
eressea.settings.set("rules.economy.food", "0") eressea.settings.set("rules.economy.food", "0")
eressea.settings.set("nmr.removenewbie", "0") eressea.settings.set("nmr.removenewbie", "0")
eressea.settings.set("nmr.timeout", "0") eressea.settings.set("nmr.timeout", "0")
eressea.settings.set("GiveRestriction", "0")
eressea.settings.set("rules.magic.playerschools", "") eressea.settings.set("rules.magic.playerschools", "")
conf = [[{ conf = [[{
"races": { "races": {