Skip to content

Unittest: fix catch_assert for glibc2.41 (#1339) #1348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anordal wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Unittest: fix catch_assert for glibc2.41 (#1339) #1348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ee487d
Unittest: Fix catch_assert() for Glibc>=2.41
anordal Jun 15, 2026
fd4ac1a
catch_assert: Use siglongjmp instead of restoring signals manually
anordal Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 34 additions & 28 deletions test/unit-test/catch_assert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,41 +37,47 @@
#include <signal.h>
#include <unistd.h>

#ifndef CATCH_JMPBUF
#define CATCH_JMPBUF waypoint_
#endif

static jmp_buf CATCH_JMPBUF;
/* Global state apology: Sigaction offers no context. */
static sigjmp_buf catch_waypoint;

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
static void catchHandler_( int signal )
static void catch_rollBack( int signal )
{
siglongjmp( catch_waypoint, signal );
}
static void catch_setSigabrtHandler( void )
{
struct sigaction sa = { 0 };

sa.sa_handler = catch_rollBack;
sigaction( SIGABRT, &sa, NULL );
}
static int catch_saveStderr()
{
int savedStderr = dup( 2 );

close( 2 );
return savedStderr;
}
static void catch_restoreStderr( int savedStderr )
{
longjmp( CATCH_JMPBUF, signal );
dup2( savedStderr, 2 );
close( savedStderr );
}
#pragma GCC diagnostic pop

#define catch_assert( x ) \
do { \
int ltry = 0, lcatch = 0; \
int saveFd = dup( 2 ); \
struct sigaction sa = { 0 }, saveSa; \
sa.sa_handler = catchHandler_; \
sigaction( SIGABRT, &sa, &saveSa ); \
close( 2 ); \
if( setjmp( CATCH_JMPBUF ) == 0 ) \
{ \
ltry++; \
x; \
} \
else \
{ \
lcatch++; \
} \
sigaction( SIGABRT, &saveSa, NULL ); \
dup2( saveFd, 2 ); \
close( saveFd ); \
TEST_ASSERT_EQUAL( ltry, lcatch ); \
#define catch_assert( x ) \
do { \
int catch_stderr = catch_saveStderr(); \
int catch_signal = sigsetjmp( catch_waypoint, 1 ); \
if( catch_signal == 0 ) \
{ \
catch_setSigabrtHandler(); \
x; \
} \
catch_restoreStderr( catch_stderr ); \
TEST_ASSERT_EQUAL( SIGABRT, catch_signal ); \
} while( 0 )

#endif /* ifndef CATCH_ASSERT_H_ */