X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Flib%2Ftest.qh;h=e806db754735d03b4e57e7a02193392682663bc7;hp=8d8de76ec6119abecd88093b0bd52bd8e1bb08e3;hb=45d8904a100765555e622598a39967963733df1d;hpb=ff169c9d675521c4e05efe123024cf9703fd4984 diff --git a/qcsrc/lib/test.qh b/qcsrc/lib/test.qh index 8d8de76ec..e806db754 100644 --- a/qcsrc/lib/test.qh +++ b/qcsrc/lib/test.qh @@ -15,7 +15,10 @@ #define SUCCEED() (TEST_ok = true) /** Add a failure, but continue */ -#define ADD_FAILURE(msg) MACRO_BEGIN { ++TEST_failed; LOG_WARN(msg); } MACRO_END +#define ADD_FAILURE(msg) MACRO_BEGIN \ + ++TEST_failed; \ + LOG_WARN(msg); \ +MACRO_END /** Add a failure and return */ #define FAIL(msg) _TEST_ASSERT(ADD_FAILURE(msg)) @@ -26,7 +29,7 @@ bool RUN_ALL_TESTS(); // difference between expect/assert: assert returns early -#define EXPECT_EQ(expected_, actual_) MACRO_BEGIN { \ +#define EXPECT_EQ(expected_, actual_) MACRO_BEGIN \ int expected = expected_; \ int actual = actual_; \ if ((expected) != (actual)) { \ @@ -37,7 +40,7 @@ bool RUN_ALL_TESTS(); actual, expected \ )); \ } \ -} MACRO_END +MACRO_END #define ASSERT_EQ(expected, actual) _TEST_ASSERT(EXPECT_EQ(expected, actual)) #define EXPECT_TRUE(condition) EXPECT_EQ(true, condition) @@ -72,18 +75,18 @@ bool TEST_ok; int TEST_failed; #define _TEST_ASSERT(statement) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ LAMBDA(statement); \ ++TEST_fatal; return; \ - } MACRO_END + MACRO_END #define EXPECT_NO_FATAL_FAILURE__(statement, then) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ int TEST_prevfatal = TEST_fatal; \ LAMBDA(statement); \ if (TEST_fatal != TEST_prevfatal) \ LAMBDA(then); \ - } MACRO_END + MACRO_END #define EXPECT_NO_FATAL_FAILURE_(statement, then) \ EXPECT_NO_FATAL_FAILURE__(statement, { \