# HG changeset patch # User Mike Becker # Date 1613298647 -3600 # Node ID 76b76f0f046b64b149cfe12d7497732f52f7771a # Parent 5d167af0eadbe101ca0ecb09492d29b14569de42 add test config and let the test binary return nonzero on test failures 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; } diff -r 5d167af0eadb -r 76b76f0f046b test/test_config.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/test_config.h Sun Feb 14 11:30:47 2021 +0100 @@ -0,0 +1,36 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2021 Mike Becker, Olaf Wintermann All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef UCX_TEST_CONFIG_H +#define UCX_TEST_CONFIG_H + +#include + +#define UCX_CU_BRM CU_BRM_NORMAL + +#endif /* UCX_TEST_CONFIG_H */