From b3aeba684b4e27e9fdf2c07949750bb567e40d6b Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Thu, 19 Feb 2015 09:38:01 +0100
Subject: Unit tests must be done at integration process.

* Remove --enable-unittests and --disable-unittests and add --do-unittests function
* --do-unittests function will exit 0 on success.
* minetest and minetestserver binaries are launched with --do-unittests in travis build.
---
 src/test.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/test.cpp')

diff --git a/src/test.cpp b/src/test.cpp
index d8ab6336f..40943035d 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -2132,9 +2132,9 @@ void run_tests()
 	TEST(TestCollision);
 	if(INTERNET_SIMULATOR == false){
 		TEST(TestSocket);
-		dout_con<<"=== BEGIN RUNNING UNIT TESTS FOR CONNECTION ==="<<std::endl;
+		dout_con << "=== BEGIN RUNNING UNIT TESTS FOR CONNECTION ===" << std::endl;
 		TEST(TestConnection);
-		dout_con<<"=== END RUNNING UNIT TESTS FOR CONNECTION ==="<<std::endl;
+		dout_con << "=== END RUNNING UNIT TESTS FOR CONNECTION ===" << std::endl;
 	}
 
 	log_set_lev_silence(LMT_ERROR, false);
@@ -2142,13 +2142,13 @@ void run_tests()
 	delete idef;
 	delete ndef;
 
-	if(tests_failed == 0){
-		infostream<<"run_tests(): "<<tests_failed<<" / "<<tests_run<<" tests failed."<<std::endl;
-		infostream<<"run_tests() passed."<<std::endl;
+	if(tests_failed == 0) {
+		actionstream << "run_tests(): " << tests_failed << " / " << tests_run << " tests failed." << std::endl;
+		actionstream << "run_tests() passed." << std::endl;
 		return;
 	} else {
-		errorstream<<"run_tests(): "<<tests_failed<<" / "<<tests_run<<" tests failed."<<std::endl;
-		errorstream<<"run_tests() aborting."<<std::endl;
+		errorstream << "run_tests(): " << tests_failed << " / " << tests_run << " tests failed." << std::endl;
+		errorstream << "run_tests() aborting." << std::endl;
 		abort();
 	}
 }
-- 
cgit v1.2.3