diff --git a/cutest b/cutest index 788659594..d83cec09a 160000 --- a/cutest +++ b/cutest @@ -1 +1 @@ -Subproject commit 788659594ef87e9f497b8039da764182adfd2943 +Subproject commit d83cec09a52835274ab8ed4849de16fb8658982a diff --git a/s/runtests b/s/runtests index 1ad5a0b0a..c56619db1 100755 --- a/s/runtests +++ b/s/runtests @@ -18,7 +18,7 @@ fi echo $ROOT $ROOT/$BIN_DIR/eressea/test_eressea pushd $ROOT/game-e2 -$ROOT/$BIN_DIR/eressea/eressea -e run_tests +$ROOT/$BIN_DIR/eressea/eressea runtests.lua cd $ROOT/game-e3 -$ROOT/$BIN_DIR/eressea/eressea -e run_tests +$ROOT/$BIN_DIR/eressea/eressea runtests.lua popd diff --git a/src/bindings.c b/src/bindings.c index 3bd2db543..3d8a83388 100755 --- a/src/bindings.c +++ b/src/bindings.c @@ -1218,7 +1218,6 @@ int eressea_run(lua_State *L, const char *luafile) err = lua_pcall(L, 1, 1, -3); if (err != 0) { log_lua_error(L); - abort(); } else { if (lua_isnumber(L, -1)) { err = (int)lua_tonumber(L, -1);