Remove some abort() calls

est31 · est31 · commit 5f342aa0154e · 2015-10-26T04:45:00.000+01:00
abort() doesn't benefit from the high level abstractions from FATAL_ERROR.
diff --git 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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,7 @@ int main(int argc, char *argv[])`
`183`	`183`	`#ifndef __ANDROID__`
`184`	`184`	`// Run unit tests`
`185`	`185`	`if (cmd_args.getFlag("run-unittests")) {`
`186`		`- run_tests();`
`187`		`- return 0;`
	`186`	`+ return run_tests();`
`188`	`187`	`}`
`189`	`188`	`#endif`
`190`	`189`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ void TestGameDef::defineSomeNodes()`
`215`	`215`	`//// run_tests`
`216`	`216`	`////`
`217`	`217`
`218`		`-void run_tests()`
	`218`	`+bool run_tests()`
`219`	`219`	`{`
`220`	`220`	`DSTACK(FUNCTION_NAME);`
`221`	`221`
`@@ -253,8 +253,7 @@ void run_tests()`
`253`	`253`	`<< "++++++++++++++++++++++++++++++++++++++++"`
`254`	`254`	`<< "++++++++++++++++++++++++++++++++++++++++" << std::endl;`
`255`	`255`
`256`		`- if (num_modules_failed)`
`257`		`- abort();`
	`256`	`+ return num_modules_failed;`
`258`	`257`	`}`
`259`	`258`
`260`	`259`	`////`