From 7919318be715e3bf60f01b7c63816a3e5802176d Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 31 Jul 2015 23:29:51 -0400 Subject: [PATCH] tests: Log exceptions thrown inside of unit tests --- src/unittest/test.h | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) 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