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

stop tests from crashing

This commit is contained in:
Enno Rehling 2014-05-04 15:54:56 -07:00
parent cb458db9a1
commit 19a21772e4
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cutest

@ -1 +1 @@
Subproject commit 788659594ef87e9f497b8039da764182adfd2943 Subproject commit d83cec09a52835274ab8ed4849de16fb8658982a

4
s/runtests
View File

@ -18,7 +18,7 @@ fi
echo $ROOT echo $ROOT
$ROOT/$BIN_DIR/eressea/test_eressea $ROOT/$BIN_DIR/eressea/test_eressea
pushd $ROOT/game-e2 pushd $ROOT/game-e2
$ROOT/$BIN_DIR/eressea/eressea -e run_tests $ROOT/$BIN_DIR/eressea/eressea runtests.lua
cd $ROOT/game-e3 cd $ROOT/game-e3
$ROOT/$BIN_DIR/eressea/eressea -e run_tests $ROOT/$BIN_DIR/eressea/eressea runtests.lua
popd popd

1
src/bindings.c
View File

@ -1218,7 +1218,6 @@ int eressea_run(lua_State *L, const char *luafile)
err = lua_pcall(L, 1, 1, -3); err = lua_pcall(L, 1, 1, -3);
if (err != 0) { if (err != 0) {
log_lua_error(L); log_lua_error(L);
abort();
} else { } else {
if (lua_isnumber(L, -1)) { if (lua_isnumber(L, -1)) {
err = (int)lua_tonumber(L, -1); err = (int)lua_tonumber(L, -1);