diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-12-08 17:52:53 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-12-08 17:52:53 +0000 |
commit | 2317457e101509ca16a669d99719ae44b0c60599 (patch) | |
tree | 76c26f4c12c18c55f067f00e644a28dded70c79b /testsuites/psxtests/psx02 | |
parent | 500fcd5c880e3cd281dced795c88407e3e67b2af (diff) |
2009-12-08 Joel Sherrill <joel.sherrill@oarcorp.com>
* 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.
Diffstat (limited to 'testsuites/psxtests/psx02')
-rw-r--r-- | testsuites/psxtests/psx02/init.c | 26 | ||||
-rw-r--r-- | testsuites/psxtests/psx02/task.c | 4 |
2 files changed, 15 insertions, 15 deletions
diff --git a/testsuites/psxtests/psx02/init.c b/testsuites/psxtests/psx02/init.c index 0f03f0e1d4..6530f1bfee 100644 --- a/testsuites/psxtests/psx02/init.c +++ b/testsuites/psxtests/psx02/init.c @@ -56,7 +56,7 @@ void *POSIX_Init( /* install a signal handler */ status = sigemptyset( &act.sa_mask ); - assert( !status ); + rtems_test_assert( !status ); act.sa_handler = Signal_handler; act.sa_flags = 0; @@ -69,43 +69,43 @@ void *POSIX_Init( Signal_occurred = 0; status = pthread_kill( Init_id, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); Signal_occurred = 0; /* now block the signal, send it, see if it is pending, and unblock it */ status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: Block SIGUSR1\n" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - assert( !status ); + rtems_test_assert( !status ); status = sigpending( &pending_set ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: Signals pending 0x%08x\n", (unsigned int) pending_set ); printf( "Init: send SIGUSR1 to self\n" ); status = pthread_kill( Init_id, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); status = sigpending( &pending_set ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: Signals pending 0x%08x\n", (unsigned int) pending_set ); printf( "Init: Unblock SIGUSR1\n" ); status = sigprocmask( SIG_UNBLOCK, &mask, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* create a thread */ status = pthread_create( &Task_id, NULL, Task_1_through_3, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* * Loop for 5 seconds seeing how many signals we catch @@ -122,10 +122,10 @@ void *POSIX_Init( status = nanosleep ( &tv, &tr ); if ( status == -1 ) { - assert( errno == EINTR ); - assert( tr.tv_nsec || tr.tv_sec ); + rtems_test_assert( errno == EINTR ); + rtems_test_assert( tr.tv_nsec || tr.tv_sec ); } else if ( !status ) { - assert( !tr.tv_nsec && !tr.tv_sec ); + rtems_test_assert( !tr.tv_nsec && !tr.tv_sec ); } printf( diff --git a/testsuites/psxtests/psx02/task.c b/testsuites/psxtests/psx02/task.c index aacc5a7b84..84a6fbc735 100644 --- a/testsuites/psxtests/psx02/task.c +++ b/testsuites/psxtests/psx02/task.c @@ -32,10 +32,10 @@ void *Task_1_through_3( for ( i=0 ; i<5 ; i++ ) { print_current_time( "Task1: ", "" ); status = pthread_kill( Init_id, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); seconds = sleep( 1 ); - assert( !seconds ); + rtems_test_assert( !seconds ); } puts( "*** END OF POSIX TEST 2 ***" ); rtems_test_exit( 0 ); |