Compare commits
1 Commits
9
...
a0bdc9c6e4
| Author | SHA1 | Date | |
|---|---|---|---|
|
a0bdc9c6e4
|
@@ -158,18 +158,10 @@ add_custom_command(
|
|||||||
VERBATIM
|
VERBATIM
|
||||||
)
|
)
|
||||||
|
|
||||||
# More than one library target consumes the generated sources below. Route
|
|
||||||
# them through one explicit prerequisite so parallel Make builds cannot invoke
|
|
||||||
# the same generator twice and interleave writes to errno.c.
|
|
||||||
add_custom_target(akerror_generated
|
|
||||||
DEPENDS ${GENERATED_ERRNO_C} ${GENERATED_AKERROR_H}
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(akerror SHARED
|
add_library(akerror SHARED
|
||||||
src/error.c
|
src/error.c
|
||||||
${GENERATED_ERRNO_C}
|
${GENERATED_ERRNO_C}
|
||||||
)
|
)
|
||||||
add_dependencies(akerror akerror_generated)
|
|
||||||
|
|
||||||
target_include_directories(akerror PUBLIC
|
target_include_directories(akerror PUBLIC
|
||||||
$<BUILD_INTERFACE:${GENERATED_DIR}/include>
|
$<BUILD_INTERFACE:${GENERATED_DIR}/include>
|
||||||
@@ -208,32 +200,6 @@ set_target_properties(akerror PROPERTIES
|
|||||||
akerr_instrument_for_coverage(akerror)
|
akerr_instrument_for_coverage(akerror)
|
||||||
akerr_instrument_for_sanitizers(akerror)
|
akerr_instrument_for_sanitizers(akerror)
|
||||||
|
|
||||||
# akerr_init() must terminate if it cannot reserve the library-owned status
|
|
||||||
# band. The production table sizes are deliberately PRIVATE, so exercise that
|
|
||||||
# otherwise unreachable startup failure with a second library target whose
|
|
||||||
# private registries cannot accept even the first reservation. Keeping this a
|
|
||||||
# distinct target is the test: no compile definition leaks into consumers or
|
|
||||||
# weakens the production library.
|
|
||||||
add_library(akerror_init_failure SHARED
|
|
||||||
src/error.c
|
|
||||||
${GENERATED_ERRNO_C}
|
|
||||||
)
|
|
||||||
add_dependencies(akerror_init_failure akerror_generated)
|
|
||||||
target_include_directories(akerror_init_failure PUBLIC
|
|
||||||
${GENERATED_DIR}/include
|
|
||||||
)
|
|
||||||
target_compile_definitions(akerror_init_failure
|
|
||||||
PUBLIC AKERR_USE_STDLIB=${AKERR_USE_STDLIB}
|
|
||||||
PRIVATE AKERR_STATUS_NAME_SLOTS=8
|
|
||||||
PRIVATE AKERR_MAX_RESERVED_STATUS_RANGES=0
|
|
||||||
PRIVATE ${AKERR_THREADS_DEFINE}
|
|
||||||
)
|
|
||||||
if(AKERR_THREAD_SAFE)
|
|
||||||
target_link_libraries(akerror_init_failure PRIVATE Threads::Threads)
|
|
||||||
endif()
|
|
||||||
akerr_instrument_for_coverage(akerror_init_failure)
|
|
||||||
akerr_instrument_for_sanitizers(akerror_init_failure)
|
|
||||||
|
|
||||||
# Each test is one source file in tests/ built into test_<name> and registered
|
# Each test is one source file in tests/ built into test_<name> and registered
|
||||||
# as CTest <name>. Tests expected to abort (unhandled error / contract
|
# as CTest <name>. Tests expected to abort (unhandled error / contract
|
||||||
# violation) go in AKERR_WILL_FAIL_TESTS; all others must exit 0.
|
# violation) go in AKERR_WILL_FAIL_TESTS; all others must exit 0.
|
||||||
@@ -261,7 +227,6 @@ set(AKERR_TESTS
|
|||||||
err_registry_init_order
|
err_registry_init_order
|
||||||
err_status_exception
|
err_status_exception
|
||||||
err_copy_string
|
err_copy_string
|
||||||
err_init_reservation_fatal
|
|
||||||
err_library_status_fatal
|
err_library_status_fatal
|
||||||
err_refcount_double_fail
|
err_refcount_double_fail
|
||||||
err_stacktrace_bounds
|
err_stacktrace_bounds
|
||||||
@@ -289,18 +254,13 @@ endif()
|
|||||||
set(AKERR_WILL_FAIL_TESTS
|
set(AKERR_WILL_FAIL_TESTS
|
||||||
err_trace
|
err_trace
|
||||||
err_improper_closure
|
err_improper_closure
|
||||||
err_init_reservation_fatal
|
|
||||||
err_library_status_fatal
|
err_library_status_fatal
|
||||||
)
|
)
|
||||||
|
|
||||||
foreach(_test IN LISTS AKERR_TESTS)
|
foreach(_test IN LISTS AKERR_TESTS)
|
||||||
add_executable(test_${_test} tests/${_test}.c)
|
add_executable(test_${_test} tests/${_test}.c)
|
||||||
target_include_directories(test_${_test} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
|
target_include_directories(test_${_test} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
|
||||||
if(_test STREQUAL "err_init_reservation_fatal")
|
|
||||||
target_link_libraries(test_${_test} PRIVATE akerror_init_failure)
|
|
||||||
else()
|
|
||||||
target_link_libraries(test_${_test} PRIVATE akerror)
|
target_link_libraries(test_${_test} PRIVATE akerror)
|
||||||
endif()
|
|
||||||
if(AKERR_THREAD_SAFE)
|
if(AKERR_THREAD_SAFE)
|
||||||
target_link_libraries(test_${_test} PRIVATE Threads::Threads)
|
target_link_libraries(test_${_test} PRIVATE Threads::Threads)
|
||||||
endif()
|
endif()
|
||||||
@@ -401,8 +361,17 @@ configure_package_config_file(
|
|||||||
INSTALL_DESTINATION ${akerror_install_cmakedir}
|
INSTALL_DESTINATION ${akerror_install_cmakedir}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# The SOVERSION is the project major version, so packages with the same major
|
||||||
|
# are ABI-compatible and a different major must be rejected.
|
||||||
|
write_basic_package_version_file(
|
||||||
|
"${CMAKE_CURRENT_BINARY_DIR}/akerrorConfigVersion.cmake"
|
||||||
|
VERSION ${PROJECT_VERSION}
|
||||||
|
COMPATIBILITY SameMajorVersion
|
||||||
|
)
|
||||||
|
|
||||||
install(FILES
|
install(FILES
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/akerrorConfig.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/akerrorConfig.cmake"
|
||||||
|
"${CMAKE_CURRENT_BINARY_DIR}/akerrorConfigVersion.cmake"
|
||||||
DESTINATION ${akerror_install_cmakedir}
|
DESTINATION ${akerror_install_cmakedir}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -88,10 +88,7 @@ typedef struct
|
|||||||
|
|
||||||
static akerr_StatusName akerr_status_names[AKERR_STATUS_NAME_SLOTS];
|
static akerr_StatusName akerr_status_names[AKERR_STATUS_NAME_SLOTS];
|
||||||
static int akerr_status_name_count;
|
static int akerr_status_name_count;
|
||||||
/* C has no portable zero-length arrays. Keep one unused physical slot when a
|
static akerr_StatusRange akerr_status_ranges[AKERR_MAX_RESERVED_STATUS_RANGES];
|
||||||
* test build sets the logical capacity to zero to drive init's fatal path. */
|
|
||||||
static akerr_StatusRange akerr_status_ranges[
|
|
||||||
AKERR_MAX_RESERVED_STATUS_RANGES > 0 ? AKERR_MAX_RESERVED_STATUS_RANGES : 1];
|
|
||||||
static int akerr_status_range_count;
|
static int akerr_status_range_count;
|
||||||
|
|
||||||
akerr_ErrorContext AKERR_ARRAY_ERROR[AKERR_MAX_ARRAY_ERROR];
|
akerr_ErrorContext AKERR_ARRAY_ERROR[AKERR_MAX_ARRAY_ERROR];
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
#include "akerror.h"
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This executable links to akerror_init_failure, a test-only library target
|
|
||||||
* with no status-range slots. The first reservation in akerr_init() must be
|
|
||||||
* terminal: continuing would leave every library status unowned and make all
|
|
||||||
* subsequent name registrations invalid.
|
|
||||||
*
|
|
||||||
* CTest marks this WILL_FAIL. Reaching the message and returning zero means
|
|
||||||
* initialization swallowed its own reservation failure.
|
|
||||||
*/
|
|
||||||
int main(void)
|
|
||||||
{
|
|
||||||
akerr_init();
|
|
||||||
|
|
||||||
fprintf(stderr, "err_init_reservation_fatal: akerr_init did not terminate\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user