From 1c4778e3efa015babbaca4a31e85431d64e6ab61 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 21 May 2015 11:05:24 +0200
Subject: [PATCH] abort tests when non-zero exit-code is returned, fix
 GiveRestriction for pool tests

---
 s/runtests             | 2 +-
 scripts/tests/pool.lua | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/s/runtests b/s/runtests
index 4495d5ed0..7aea152b5 100755
--- a/s/runtests
+++ b/s/runtests
@@ -15,7 +15,7 @@ if [ ! -d $ROOT/$BIN_DIR ]; then
   exit
 fi
 
-$ROOT/$BIN_DIR/eressea/test_eressea
+$ROOT/$BIN_DIR/eressea/test_eressea || exit $?
 cd $ROOT
 [ -e eressea.ini ] || ln -sf conf/eressea.ini
 $ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests.lua || exit $?
diff --git a/scripts/tests/pool.lua b/scripts/tests/pool.lua
index 2ac9c87f2..b89d180fa 100644
--- a/scripts/tests/pool.lua
+++ b/scripts/tests/pool.lua
@@ -8,6 +8,7 @@ function setup()
     eressea.settings.set("rules.economy.food", "0")
     eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
+    eressea.settings.set("GiveRestriction", "0")
     eressea.settings.set("rules.magic.playerschools", "")
     conf = [[{
         "races": {