Skip to content
Permalink
Browse files

Remove some abort() calls

abort() doesn't benefit from the high level abstractions from FATAL_ERROR.
  • Loading branch information
est31 committed Oct 26, 2015
1 parent d69ef6a commit 5f342aa0154e59503fbb22e46ac95ef655aaad1a
Showing with 7 additions and 13 deletions.
  1. +1 −2 src/main.cpp
  2. +3 −7 src/script/cpp_api/s_async.cpp
  3. +2 −3 src/unittest/test.cpp
  4. +1 −1 src/unittest/test.h
@@ -183,8 +183,7 @@ int main(int argc, char *argv[])
#ifndef __ANDROID__
// Run unit tests
if (cmd_args.getFlag("run-unittests")) {
run_tests();
return 0;
return run_tests();
}
#endif

@@ -244,17 +244,14 @@ void* AsyncWorkerThread::run()

std::string script = getServer()->getBuiltinLuaPath() + DIR_DELIM + "init.lua";
if (!loadScript(script)) {
errorstream << "execution of async base environment failed!"
<< std::endl;
abort();
FATAL_ERROR("execution of async base environment failed!");
}

int error_handler = PUSH_ERROR_HANDLER(L);

lua_getglobal(L, "core");
if (lua_isnil(L, -1)) {
errorstream << "Unable to find core within async environment!";
abort();
FATAL_ERROR("Unable to find core within async environment!");
}

// Main loop
@@ -268,8 +265,7 @@ void* AsyncWorkerThread::run()

lua_getfield(L, -1, "job_processor");
if (lua_isnil(L, -1)) {
errorstream << "Unable to get async job processor!" << std::endl;
abort();
FATAL_ERROR("Unable to get async job processor!");
}

luaL_checktype(L, -1, LUA_TFUNCTION);
@@ -215,7 +215,7 @@ void TestGameDef::defineSomeNodes()
//// run_tests
////

void run_tests()
bool run_tests()
{
DSTACK(FUNCTION_NAME);

@@ -253,8 +253,7 @@ void run_tests()
<< "++++++++++++++++++++++++++++++++++++++++"
<< "++++++++++++++++++++++++++++++++++++++++" << std::endl;

if (num_modules_failed)
abort();
return num_modules_failed;
}

////
@@ -142,6 +142,6 @@ extern content_t t_CONTENT_WATER;
extern content_t t_CONTENT_LAVA;
extern content_t t_CONTENT_BRICK;

void run_tests();
bool run_tests();

#endif

0 comments on commit 5f342aa

Please sign in to comment.