X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Ftest.qh;h=8d8de76ec6119abecd88093b0bd52bd8e1bb08e3;hb=16e64ff58cf65d7b3e0815aadb530580a6aa251b;hp=d05ae28cd903b76edc4770204b142d5f8689c589;hpb=f52ddede69621c7c9d31983591902f47fd40d7d0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/lib/test.qh b/qcsrc/lib/test.qh index d05ae28cd..8d8de76ec 100644 --- a/qcsrc/lib/test.qh +++ b/qcsrc/lib/test.qh @@ -5,7 +5,7 @@ /** Use UpperCamelCase for suite and test only */ #define TEST(suite, test) \ void _TEST_##suite##_##test(); \ - [[accumulate]] int TEST_RunAll_accumulated(int f) { \ + ACCUMULATE int TEST_RunAll_accumulated(int f) { \ if (!TEST_Run(#suite "_" #test)) ++f; \ return = f; \ } \ @@ -15,7 +15,7 @@ #define SUCCEED() (TEST_ok = true) /** Add a failure, but continue */ -#define ADD_FAILURE(msg) MACRO_BEGIN { ++TEST_failed; LOG_WARNINGF(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)) @@ -87,7 +87,7 @@ int TEST_failed; #define EXPECT_NO_FATAL_FAILURE_(statement, then) \ EXPECT_NO_FATAL_FAILURE__(statement, { \ - LOG_WARNINGF( \ + LOG_WARNF( \ " Actual: %d fatal failures\n" \ "Expected: no fatal failures\n", \ TEST_fatal - TEST_prevfatal \