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

Merge pull request #639 from ennorehling/develop 

BUG 2273: runtests.bat fails when config is auto-loaded.
This commit is contained in:
Enno Rehling 2017-01-24 11:52:32 +01:00 committed by GitHub
parent 9cea70afe8 404ac546fa
commit d4e8a43048
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/tests/e3/castles.lua
View File

@ -46,7 +46,7 @@ end
function test_build_packice() function test_build_packice()
local r = region.create(0, 0, "packice") local r = region.create(0, 0, "packice")
local f = faction.create("noreply@eressea.de", "human", "de") local f = faction.create("packice@eressea.de", "human", "de")
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u:clear_orders() u:clear_orders()
u:add_item("stone", 10) u:add_item("stone", 10)

6
tests/runtests.bat
View File

@ -6,9 +6,9 @@ IF EXIST ..\build-vs14 SET BUILD=..\build-vs14\eressea\Debug
SET SERVER=%BUILD%\eressea.exe SET SERVER=%BUILD%\eressea.exe
%BUILD%\test_eressea.exe %BUILD%\test_eressea.exe
%SERVER% ..\scripts\run-tests.lua %SERVER% ..\scripts\run-tests.lua
%SERVER% ..\scripts\run-tests-e2.lua %SERVER% -re2 ..\scripts\run-tests-e2.lua
%SERVER% ..\scripts\run-tests-e3.lua %SERVER% -re3 ..\scripts\run-tests-e3.lua
%SERVER% ..\scripts\run-tests-e4.lua %SERVER% -re4 ..\scripts\run-tests-e4.lua
PAUSE PAUSE
RMDIR /s /q reports RMDIR /s /q reports
DEL score score.alliances datum turn DEL score score.alliances datum turn