From 88f454e1f746ef60ded1ccdb51a16ded8b374f06 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 21 May 2015 08:27:07 +0200
Subject: [PATCH] failed tests abort runtests and return an error code small
 test world for (future) valgrind tests.

---
 s/runtests               |   6 +++---
 scripts/run-tests-e2.lua |   2 +-
 scripts/run-tests-e3.lua |   2 +-
 scripts/run-tests.lua    |   2 +-
 tests/data/184.dat       | Bin 0 -> 7702 bytes
 tests/eressea.ini        |  19 +++++++++++++++++++
 tests/orders.184         |   0
 7 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 tests/data/184.dat
 create mode 100644 tests/eressea.ini
 create mode 100644 tests/orders.184

diff --git a/s/runtests b/s/runtests
index ef7fc71df..4495d5ed0 100755
--- a/s/runtests
+++ b/s/runtests
@@ -18,7 +18,7 @@ fi
 $ROOT/$BIN_DIR/eressea/test_eressea
 cd $ROOT
 [ -e eressea.ini ] || ln -sf conf/eressea.ini
-$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests.lua
-$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e2.lua
-$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e3.lua
+$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests.lua || exit $?
+$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e2.lua || exit $?
+$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e3.lua || exit $?
 cd $OLDWPD
diff --git a/scripts/run-tests-e2.lua b/scripts/run-tests-e2.lua
index 9f08b0f54..4a2b3e59e 100644
--- a/scripts/run-tests-e2.lua
+++ b/scripts/run-tests-e2.lua
@@ -19,4 +19,4 @@ require 'lunit'
 
 rules = require('eressea.' .. config.rules)
 result = lunit.main()
-return result.errors
+return result.errors + result.failed
diff --git a/scripts/run-tests-e3.lua b/scripts/run-tests-e3.lua
index 2f823daa7..47bcca60b 100644
--- a/scripts/run-tests-e3.lua
+++ b/scripts/run-tests-e3.lua
@@ -20,4 +20,4 @@ require 'lunit'
 eressea.settings.set("rules.alliances", "0")
 rules = require('eressea.' .. config.rules)
 result = lunit.main()
-return result.errors
+return result.errors + result.failed
diff --git a/scripts/run-tests.lua b/scripts/run-tests.lua
index d13a1425b..d1306ddcd 100644
--- a/scripts/run-tests.lua
+++ b/scripts/run-tests.lua
@@ -14,4 +14,4 @@ require 'eressea.path'
 require 'tests'
 require 'lunit'
 result = lunit.main()
-return result.errors
+return result.errors + result.failed
diff --git a/tests/data/184.dat b/tests/data/184.dat
new file mode 100644
index 0000000000000000000000000000000000000000..74d72258a256f2c8b3f00c0208058e83d1ff5d92
GIT binary patch
literal 7702
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
M6Z;Qhi>TcDFN&_=EC2ui

literal 0
HcmV?d00001

diff --git a/tests/eressea.ini b/tests/eressea.ini
new file mode 100644
index 000000000..9f324fe71
--- /dev/null
+++ b/tests/eressea.ini
@@ -0,0 +1,19 @@
+
+[eressea]
+base                           = .
+report                         = reports
+verbose                        = 0
+lomem                          = 0
+debug                          = 0
+memcheck                       = 0
+locales                        = de,en
+
+[lua]
+install                        = ..
+paths                          = lunit:scripts
+maxnmrs                        = 20
+rules                          = e2
+
+[editor]
+color                          = 1
+
diff --git a/tests/orders.184 b/tests/orders.184
new file mode 100644
index 000000000..e69de29bb