diff -r 5d167af0eadb -r 76b76f0f046b test/test_allocator.c --- a/test/test_allocator.c Sun Feb 14 11:30:19 2021 +0100 +++ b/test/test_allocator.c Sun Feb 14 11:30:47 2021 +0100 @@ -27,8 +27,7 @@ */ #include "cx/allocator.h" - -#include +#include "test_config.h" void test_default_allocator_available(void) { cx_allocator_class *clazz = cxDefaultAllocator->cl; @@ -69,26 +68,31 @@ return CU_get_error(); } - suite = CU_add_suite("stdlib allocator", NULL, NULL); + suite = CU_add_suite("default allocator", NULL, NULL); if (NULL == suite) { CU_cleanup_registry(); return CU_get_error(); } if ( - (NULL == CU_add_test(suite, "default allocator available", test_default_allocator_available)) || - (NULL == CU_add_test(suite, "test of malloc()", test_default_malloc)) || - (NULL == CU_add_test(suite, "test of realloc()", test_default_realloc)) || - (NULL == CU_add_test(suite, "test of realloc()", test_default_calloc)) || - (NULL == CU_add_test(suite, "test of free()", test_default_free)) + !CU_add_test(suite, "default allocator available", test_default_allocator_available) || + !CU_add_test(suite, "test of malloc()", test_default_malloc)|| + !CU_add_test(suite, "test of realloc()", test_default_realloc) || + !CU_add_test(suite, "test of realloc()", test_default_calloc) || + !CU_add_test(suite, "test of free()", test_default_free) ) { CU_cleanup_registry(); return CU_get_error(); } - CU_basic_set_mode(CU_BRM_NORMAL); - CU_basic_run_tests(); + CU_basic_set_mode(UCX_CU_BRM); + + int exitcode; + if (CU_basic_run_tests()) { + exitcode = CU_get_error(); + } else { + exitcode = CU_get_number_of_failures() == 0 ? 0 : 1; + } CU_cleanup_registry(); - - return CU_get_error(); + return exitcode; }