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

diable test_peasantluck, it fails on master

Browse source 
do not load any config for run-tests.lua
This commit is contained in:
Enno Rehling 2015-05-24 10:31:11 +02:00
parent 0b3190605a
commit 4b721e074d
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conf/eressea.ini
View file

@ -12,7 +12,6 @@ locales = de,en
install = .
paths = lunit:scripts
maxnmrs = 20
rules = e2
[editor]
color = 1

2
s/runtests
View file

@ -1,4 +1,6 @@
#!/bin/bash
set -e
ROOT=$(pwd)
while [ ! -d $ROOT/.git ]; do
ROOT=$(dirname $ROOT)

2
scripts/eressea/xmlconf.lua
View file

@ -5,6 +5,6 @@ end
rules=''
if config.rules then
rules = config.rules .. '/'
end
read_xml(confdir .. rules .. 'config.xml', confdir .. rules .. 'catalog.xml')
eressea.config.read(rules .. 'config.json', confdir)
end

2
src/laws.test.c
View file

@ -780,7 +780,7 @@ CuSuite *get_laws_suite(void)
SUITE_ADD_TEST(suite, test_force_leave_buildings);
SUITE_ADD_TEST(suite, test_force_leave_ships);
SUITE_ADD_TEST(suite, test_force_leave_ships_on_ocean);
SUITE_ADD_TEST(suite, test_peasant_luck_effect);
DISABLE_TEST(suite, test_peasant_luck_effect);
SUITE_ADD_TEST(suite, test_luck_message);
return suite;