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

update ini files so tests will pass again

This commit is contained in:
Enno Rehling 2014-07-23 16:01:56 +02:00
parent 44327d91f6
commit 67cf73d42c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game-e2/eressea.ini
View File

@ -8,7 +8,7 @@ memcheck = 0
locales = de,en locales = de,en
[config] [config]
game = eressea rules = eressea
source_dir = .. source_dir = ..
maxnmrs = 10 maxnmrs = 10

2
game-e3/eressea.ini
View File

@ -8,7 +8,7 @@ memcheck = 0
locales = de,en locales = de,en
[config] [config]
game = e3a rules = e3a
source_dir = .. source_dir = ..
maxnmrs = 20 maxnmrs = 20

2
s/runtests
View File

@ -18,5 +18,5 @@ fi
$ROOT/$BIN_DIR/eressea/test_eressea $ROOT/$BIN_DIR/eressea/test_eressea
cd $ROOT cd $ROOT
$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/runtests.lua $ROOT/$BIN_DIR/eressea/eressea -v0 scripts/runtests.lua
grep ERROR eressea.log #grep ERROR eressea.log
cd $OLDWPD cd $OLDWPD

6
scripts/tests/eressea.lua
View File

@ -137,9 +137,9 @@ function test_ship_capacity()
process_orders() process_orders()
-- print(s.region, u.region, r2) -- print(s.region, u.region, r2)
assert_equal(r2.id, u1.region.id, "boat with 5 humans did not move") assert_equal(r2, u1.region, "boat with 5 humans did not move")
assert_not_equal(r2.id, u2.region.id, "boat with too many people has moved") assert_not_equal(r2, u2.region, "boat with too many people has moved")
assert_not_equal(r2.id, u4.region.id, "boat with too much cargo has moved") assert_not_equal(r2, u4.region, "boat with too much cargo has moved")
end end
function test_levitate() function test_levitate()