From 9131218783410821abb653d4fbd238e99fd91d51 Mon Sep 17 00:00:00 2001 From: Gwendolyn Date: Wed, 5 Jan 2022 02:52:33 +0100 Subject: [PATCH] better XTEST_MAIN macro so it doesn't break when the function contains commas --- examples/all.c | 20 +++++++++++--------- xtest.h | 8 ++++---- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/examples/all.c b/examples/all.c index e3e7958..642bf9b 100644 --- a/examples/all.c +++ b/examples/all.c @@ -9,12 +9,14 @@ void example_groups(); void example_parameterized(); void example_skip(); -XTEST_MAIN({ - xtest_run_group(example_assertions); - xtest_run_group(example_expect_assertions); - xtest_run_group(example_fail); - xtest_run_group(example_float); - xtest_run_group(example_groups); - xtest_run_group(example_parameterized); - xtest_run_group(example_skip); -}) + + +XTEST_MAIN { + xtest_run_group(example_assertions); + xtest_run_group(example_expect_assertions); + xtest_run_group(example_fail); + xtest_run_group(example_float); + xtest_run_group(example_groups); + xtest_run_group(example_parameterized); + xtest_run_group(example_skip); +} diff --git a/xtest.h b/xtest.h index 3341c33..9962305 100644 --- a/xtest.h +++ b/xtest.h @@ -134,9 +134,9 @@ int xtest_complete(); } -#define XTEST_MAIN(block) int main(int argc, char ** argv) { \ - block \ - return xtest_complete(); \ - } +#define XTEST_MAIN void __xtest_main(); \ +XTEST_RUN_MAIN(__xtest_main) \ +void __xtest_main() + #endif //XTEST_XTEST_H