From b3dd1c40a71e54b78b2f68bb4fa683e3a9ffddcc Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 22 Mar 2010 18:19:53 -0700
Subject: [PATCH] move tests out of setup (and keep it small)

---
 game-e2/setup.lua           | 5 -----
 game-e3/setup.lua           | 5 -----
 scripts/e3a/modules.lua     | 7 +++++++
 scripts/eressea/modules.lua | 6 ++++++
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/game-e2/setup.lua b/game-e2/setup.lua
index aee5a5a45..ffbb81987 100644
--- a/game-e2/setup.lua
+++ b/game-e2/setup.lua
@@ -6,11 +6,6 @@ local paths = {
   'external/lunit/?.lua'
 }
 
-tests = {
-  srcpath .. '/server/scripts/tests/common.lua', 
-  srcpath .. '/eressea/scripts/tests/eressea.lua', 
-}
-
 for idx, path in pairs(paths) do
   package.path = srcpath .. '/' .. path .. ';' .. package.path
 end
diff --git a/game-e3/setup.lua b/game-e3/setup.lua
index 81dc6514c..9c263b4ee 100644
--- a/game-e3/setup.lua
+++ b/game-e3/setup.lua
@@ -6,11 +6,6 @@ local paths = {
   'external/lunit/?.lua'
 }
 
-tests = {
-  srcpath .. '/server/scripts/tests/common.lua', 
-  srcpath .. '/eressea/scripts/tests/e3a.lua', 
-}
-
 for idx, path in pairs(paths) do
   package.path = srcpath .. '/' .. path .. ';' .. package.path
 end
diff --git a/scripts/e3a/modules.lua b/scripts/e3a/modules.lua
index 996d6bcc7..be4ae6d2e 100644
--- a/scripts/e3a/modules.lua
+++ b/scripts/e3a/modules.lua
@@ -1,3 +1,10 @@
 require "spells"
 require "e3a.xmas2009"
 require "e3a.rules"
+
+local srcpath = config.source_dir
+tests = {
+  srcpath .. '/eressea/scripts/tests/morale.lua', 
+  srcpath .. '/server/scripts/tests/common.lua', 
+  srcpath .. '/eressea/scripts/tests/e3a.lua', 
+}
diff --git a/scripts/eressea/modules.lua b/scripts/eressea/modules.lua
index 14b699997..aa6c14114 100644
--- a/scripts/eressea/modules.lua
+++ b/scripts/eressea/modules.lua
@@ -13,3 +13,9 @@ require "eressea.xmas2006"
 require "eressea.embassy"
 require "eressea.tunnels"
 require "eressea.ents"
+
+local srcpath = config.source_dir
+tests = {
+  srcpath .. '/server/scripts/tests/common.lua', 
+  srcpath .. '/eressea/scripts/tests/eressea.lua', 
+}