Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 01:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove some abort() calls

Browse Source 
abort() doesn't benefit from the high level abstractions from FATAL_ERROR.
This commit is contained in:
est31 2015-10-26 04:13:27 +01:00
parent d69ef6acd3
commit 5f342aa015
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.cpp
View File

@ -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

10
src/script/cpp_api/s_async.cpp
View File

@ -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);

5
src/unittest/test.cpp
View File

@ -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;
}
////

2
src/unittest/test.h
View File

@ -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