From 2317457e101509ca16a669d99719ae44b0c60599 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 8 Dec 2009 17:52:53 +0000 Subject: 2009-12-08 Joel Sherrill * include/pmacros.h, psx01/task.c, psx02/init.c, psx02/task.c, psx03/init.c, psx03/task.c, psx04/init.c, psx04/task1.c, psx04/task2.c, psx04/task3.c, psx05/init.c, psx05/task.c, psx05/task2.c, psx05/task3.c, psx06/init.c, psx06/task.c, psx06/task2.c, psx07/init.c, psx08/init.c, psx08/task2.c, psx08/task3.c, psx09/init.c, psx10/init.c, psx10/task.c, psx10/task2.c, psx10/task3.c, psx11/init.c, psx11/task.c, psx12/init.c, psxalarm01/init.c, psxbarrier01/test.c, psxcancel01/init.c, psxchroot01/test.c, psxclock/init.c, psxfile01/test.c, psxfile01/test_cat.c, psxfile01/test_extend.c, psxfile01/test_write.c, psxitimer/init.c, psxkey01/task.c, psxkey02/init.c, psxkey03/init.c, psxmount/test.c, psxmsgq01/init.c, psxmsgq03/init.c, psxmsgq04/init.c, psxreaddir/test.c, psxrwlock01/test.c, psxsem01/init.c, psxsignal01/init.c, psxsignal01/task1.c, psxsignal02/init.c, psxsignal03/init.c, psxsignal05/init.c, psxspin01/test.c, psxspin02/test.c, psxstack01/init.c, psxstat/test.c, psxtime/test.c, psxualarm/init.c: Use rtems_test_assert() consistently instead of system assert(). rtems_test_assert() is designed to integrate into the RTEMS test suite infrastructure. --- testsuites/psxtests/psxsignal03/init.c | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'testsuites/psxtests/psxsignal03') diff --git a/testsuites/psxtests/psxsignal03/init.c b/testsuites/psxtests/psxsignal03/init.c index c2ff91047a..bf6042ba9a 100644 --- a/testsuites/psxtests/psxsignal03/init.c +++ b/testsuites/psxtests/psxsignal03/init.c @@ -94,35 +94,35 @@ void *Test_Thread(void *arg) /* build unblocked mask */ sc = sigemptyset( &mask ); - assert( !sc ); + rtems_test_assert( !sc ); printf( "%s - Unblock %s\n", name, signal_name(SIGNAL_ONE) ); sc = sigaddset( &mask, SIGNAL_ONE ); - assert( !sc ); + rtems_test_assert( !sc ); if ( !blocked ) { printf( "%s - Unblock %s\n", name, signal_name(SIGNAL_TWO) ); sc = sigaddset( &mask, SIGNAL_TWO ); - assert( !sc ); + rtems_test_assert( !sc ); } /* unblocked signals */ sc = pthread_sigmask( SIG_UNBLOCK, &mask, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); /* build wait mask */ sc = sigemptyset( &wait_mask ); - assert( !sc ); + rtems_test_assert( !sc ); sc = sigaddset( &wait_mask, SIGNAL_ONE ); - assert( !sc ); + rtems_test_assert( !sc ); /* wait for a signal */ memset( &info, 0, sizeof(info) ); printf( "%s - Wait for %s unblocked\n", name, signal_name(SIGNAL_ONE) ); sigwaitinfo( &wait_mask, &info ); - assert( !sc ); + rtems_test_assert( !sc ); printf( "%s - siginfo.si_signo=%d\n", name, info.si_signo ); printf( "%s - siginfo.si_code=%d\n", name, info.si_code ); @@ -132,8 +132,8 @@ void *Test_Thread(void *arg) * "implementation defined" */ printf( "%s - siginfo.si_value=0x%08" PRIxPTR "\n", name, (uintptr_t) info.si_value.sival_ptr ); - assert( info.si_signo == SIGNAL_TWO ); - assert( info.si_code == SI_USER ); + rtems_test_assert( info.si_signo == SIGNAL_TWO ); + rtems_test_assert( info.si_code == SI_USER ); printf( "%s - exiting\n", name ); return NULL; @@ -163,43 +163,43 @@ void *POSIX_Init( /* create threads */ sc = pthread_create( &id, NULL, Test_Thread, &falseArg ); - assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_create( &id, NULL, Test_Thread, &trueArg ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - sleep - let threads settle - OK" ); delay_request.tv_sec = 0; delay_request.tv_nsec = 5 * 100000000; sc = nanosleep( &delay_request, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - sleep - SignalBlocked thread settle - OK" ); sc = nanosleep( &delay_request, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); printf( "Init - sending %s - deliver to one thread\n", signal_name(SIGNAL_TWO)); sc = SEND_SIGNAL( SIGNAL_TWO ); - assert( !sc ); + rtems_test_assert( !sc ); printf( "Init - sending %s - deliver to other thread\n", signal_name(SIGNAL_TWO)); sc = SEND_SIGNAL( SIGNAL_TWO ); - assert( !sc ); + rtems_test_assert( !sc ); #if defined(TO_PROCESS) printf( "Init - sending %s - expect EAGAIN\n", signal_name(SIGNAL_TWO) ); sc = SEND_SIGNAL( SIGNAL_TWO ); - assert( sc == -1 ); - assert( errno == EAGAIN ); + rtems_test_assert( sc == -1 ); + rtems_test_assert( errno == EAGAIN ); #endif puts( "Init - sleep - let thread report if it unblocked - OK" ); usleep(500000); /* we are just sigwait'ing the signal, not delivering it */ - assert( Signal_occurred == true ); + rtems_test_assert( Signal_occurred == true ); puts( "*** END OF POSIX TEST SIGNAL " TEST_NAME " ***" ); rtems_test_exit(0); -- cgit v1.2.3