Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
bab2f102a1
|
@@ -402,6 +402,22 @@ foreach(_test IN LISTS AKERR_TESTS)
|
|||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
# The ignored-error slot is declared in the public header but must have one
|
||||||
|
# library definition. Compare its address from two translation units, and
|
||||||
|
# compile the consumer-facing test with all ordinary warnings enabled: a
|
||||||
|
# header-local TLS definition would both duplicate storage and warn when unused.
|
||||||
|
add_executable(test_err_ignore_multitu
|
||||||
|
tests/err_ignore_multitu.c
|
||||||
|
tests/err_ignore_multitu_helper.c)
|
||||||
|
target_include_directories(test_err_ignore_multitu
|
||||||
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
|
||||||
|
target_link_libraries(test_err_ignore_multitu PRIVATE akerror)
|
||||||
|
target_compile_options(test_err_ignore_multitu PRIVATE -Wall -Wextra -Werror)
|
||||||
|
if(AKERR_THREAD_SAFE)
|
||||||
|
target_link_libraries(test_err_ignore_multitu PRIVATE Threads::Threads)
|
||||||
|
endif()
|
||||||
|
add_test(NAME err_ignore_multitu COMMAND test_err_ignore_multitu)
|
||||||
|
|
||||||
# HANDLE_GROUP deliberately enters the next case label. Keep that public macro
|
# HANDLE_GROUP deliberately enters the next case label. Keep that public macro
|
||||||
# compiling with the warning enabled, so a future macro edit cannot restore the
|
# compiling with the warning enabled, so a future macro edit cannot restore the
|
||||||
# warning for consumers which adopt -Wextra.
|
# warning for consumers which adopt -Wextra.
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ extern akerr_ErrorLogFunction akerr_log_method;
|
|||||||
* after the pool slot is reused. The snapshot is read-only and is replaced by
|
* after the pool slot is reused. The snapshot is read-only and is replaced by
|
||||||
* the next ignored error. Thread local only when AKERR_THREAD_SAFE is 1.
|
* the next ignored error. Thread local only when AKERR_THREAD_SAFE is 1.
|
||||||
*/
|
*/
|
||||||
static AKERR_THREAD_LOCAL akerr_ErrorContext akerr_last_ignored;
|
extern AKERR_THREAD_LOCAL akerr_ErrorContext akerr_last_ignored;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Drop one reference, returning NULL once the last one is gone so the caller can
|
* Drop one reference, returning NULL once the last one is gone so the caller can
|
||||||
|
|||||||
@@ -28,6 +28,7 @@
|
|||||||
* template header because the macro copies into it at the call site.
|
* template header because the macro copies into it at the call site.
|
||||||
*/
|
*/
|
||||||
static AKERR_THREAD_LOCAL akerr_ErrorContext __akerr_last_ditch;
|
static AKERR_THREAD_LOCAL akerr_ErrorContext __akerr_last_ditch;
|
||||||
|
AKERR_THREAD_LOCAL akerr_ErrorContext akerr_last_ignored;
|
||||||
akerr_ErrorUnhandledErrorHandler akerr_handler_unhandled_error;
|
akerr_ErrorUnhandledErrorHandler akerr_handler_unhandled_error;
|
||||||
akerr_ErrorLogFunction akerr_log_method = NULL;
|
akerr_ErrorLogFunction akerr_log_method = NULL;
|
||||||
|
|
||||||
|
|||||||
18
tests/err_ignore_multitu.c
Normal file
18
tests/err_ignore_multitu.c
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
#include "akerror.h"
|
||||||
|
#include "err_ignore_multitu.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
akerr_ErrorContext *main_address = &akerr_last_ignored;
|
||||||
|
akerr_ErrorContext *helper_address = akerr_multitu_snapshot_address();
|
||||||
|
|
||||||
|
if ( main_address != helper_address ) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"CHECK FAILED: ignored-error storage differs between translation units\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf(stderr, "err_ignore_multitu ok\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
8
tests/err_ignore_multitu.h
Normal file
8
tests/err_ignore_multitu.h
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
#ifndef AKERR_TEST_IGNORE_MULTITU_H
|
||||||
|
#define AKERR_TEST_IGNORE_MULTITU_H
|
||||||
|
|
||||||
|
#include "akerror.h"
|
||||||
|
|
||||||
|
akerr_ErrorContext *akerr_multitu_snapshot_address(void);
|
||||||
|
|
||||||
|
#endif
|
||||||
6
tests/err_ignore_multitu_helper.c
Normal file
6
tests/err_ignore_multitu_helper.c
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
#include "err_ignore_multitu.h"
|
||||||
|
|
||||||
|
akerr_ErrorContext *akerr_multitu_snapshot_address(void)
|
||||||
|
{
|
||||||
|
return &akerr_last_ignored;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user