Remove some abort() calls

abort() doesn't benefit from the high level abstractions from FATAL_ERROR.

diff --git a/src/main.cpp b/src/main.cpp
index 1538c15d49271b8cd9dbe4df80c8a835d1b04d63..1fa9243fa78cc2c0daba873ec238da9d4a52b970 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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
 

diff --git a/src/script/cpp_api/s_async.cpp b/src/script/cpp_api/s_async.cpp
index d18ff6e8c47b7998f3dd4823ec21ee00caff39b3..1716326330355825b9b9e94b7fcf1de18e42bf11 100644 (file)
--- a/src/script/cpp_api/s_async.cpp
+++ b/src/script/cpp_api/s_async.cpp
@@ -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);

diff --git a/src/unittest/test.cpp b/src/unittest/test.cpp
index 1f3b31017b3c5068126a67451d89bc9f581ac9f4..41ccf0d2d134e38e8f31393130f817676100f360 100644 (file)
--- a/src/unittest/test.cpp
+++ b/src/unittest/test.cpp
@@ -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;
 }
 
 ////

diff --git a/src/unittest/test.h b/src/unittest/test.h
index f6c4711a5ce08b40fd49903ce28c985465cd420f..e60e657cc969cf43c1cb47c1ab3fbf5982bf347e 100644 (file)
--- a/src/unittest/test.h
+++ b/src/unittest/test.h
@@ -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