diff -r b53e0e003d7e -r ed710122af44 tests/ucxtest.c --- a/tests/ucxtest.c Wed Dec 27 14:54:04 2023 +0100 +++ b/tests/ucxtest.c Wed Dec 27 16:04:38 2023 +0100 @@ -28,32 +28,27 @@ #include "cx/test.h" +CxTestSuite *cx_test_suite_testing_allocator(void); CxTestSuite *cx_test_suite_utils(void); CxTestSuite *cx_test_suite_hash_key(void); #define run_tests(suite) cx_test_run_stdout(suite); success += (suite)->success; failure += (suite)->failure +#define execute_test_suites(...) unsigned success = 0, failure = 0; CxTestSuite* test_suites[] = {__VA_ARGS__}; \ + for (size_t i = 0; i < sizeof(test_suites)/sizeof(void*) ; i++) {run_tests(test_suites[i]);} (void)0 +#define free_test_suites for (size_t i = 0 ; i < sizeof(test_suites)/sizeof(void*) ; i++) {cx_test_suite_free(test_suites[i]);} (void)0 int main(void) { printf("UCX Tests\n---------\n"); - unsigned success = 0, failure = 0; - - // create test suites - CxTestSuite - *utils = cx_test_suite_utils(), - *hash_key = cx_test_suite_hash_key(); - - // run tests - run_tests(utils); - run_tests(hash_key); - - // print overall result + execute_test_suites( + cx_test_suite_testing_allocator(), + cx_test_suite_utils(), + cx_test_suite_hash_key() + ); printf("=== OVERALL RESULT ===\n"); printf(" Total: %u\n Success: %u\n Failure: %u\n", success + failure, success, failure); - - cx_test_suite_free(utils); - cx_test_suite_free(hash_key); + free_test_suites; return failure > 0 ? 1 : 0; }