From: kwolekr <kwolekr@minetest.net>
Date: Sat, 1 Aug 2015 03:29:51 +0000 (-0400)
Subject: tests: Log exceptions thrown inside of unit tests
X-Git-Tag: 0.4.13~67
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7919318be715e3bf60f01b7c63816a3e5802176d;p=oweals%2Fminetest.git

tests: Log exceptions thrown inside of unit tests
---

diff --git a/src/unittest/test.h b/src/unittest/test.h
index e1f1721f9..47a441e02 100644
--- a/src/unittest/test.h
+++ b/src/unittest/test.h
@@ -32,18 +32,22 @@ class TestFailedException : public std::exception {
 };
 
 // Runs a unit test and reports results
-#define TEST(fxn, ...) do {         \
-	u32 t1 = porting::getTime(PRECISION_MILLI); \
-	try {                           \
-		fxn(__VA_ARGS__);           \
-		dstream << "[PASS] ";       \
-	} catch (...) {                 \
-		dstream << "[FAIL] ";       \
-		num_tests_failed++;         \
-	}                               \
-	num_tests_run++;                \
-	u32 tdiff = porting::getTime(PRECISION_MILLI) - t1;     \
-	dstream << #fxn << " - " << tdiff << "ms" << std::endl; \
+#define TEST(fxn, ...) do {                                                 \
+	u32 t1 = porting::getTime(PRECISION_MILLI);                             \
+	try {                                                                   \
+		fxn(__VA_ARGS__);                                                   \
+		dstream << "[PASS] ";                                               \
+	} catch (TestFailedException &e) {                                      \
+		dstream << "[FAIL] ";                                               \
+		num_tests_failed++;                                                 \
+	} catch (std::exception &e) {                                           \
+		dstream << "Caught unhandled exception: " << e.what() << std::endl; \
+		dstream << "[FAIL] ";                                               \
+		num_tests_failed++;                                                 \
+	}                                                                       \
+	num_tests_run++;                                                        \
+	u32 tdiff = porting::getTime(PRECISION_MILLI) - t1;                     \
+	dstream << #fxn << " - " << tdiff << "ms" << std::endl;                 \
 } while (0)
 
 // Asserts the specified condition is true, or fails the current unit test