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 | |
| parent | 2009-12-08 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-2317457e101509ca16a669d99719ae44b0c60599.tar.bz2 | |
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')
61 files changed, 998 insertions, 948 deletions
diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index 90bb3d387a..81cc6f98af 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,3 +1,26 @@ +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. + 2009-12-03 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am, configure.ac: New test to exercise getgrnam and getpwnam diff --git a/testsuites/psxtests/include/pmacros.h b/testsuites/psxtests/include/pmacros.h index ceb2906214..be9f35c8e5 100644 --- a/testsuites/psxtests/include/pmacros.h +++ b/testsuites/psxtests/include/pmacros.h @@ -1,4 +1,11 @@ /* + * COPYRIGHT (c) 1989-2009. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * * $Id$ */ @@ -9,7 +16,6 @@ #include <bsp.h> #endif #include <pthread.h> -#include <assert.h> #include <stdio.h> #include <string.h> #include <time.h> @@ -64,10 +70,10 @@ \ tv.tv_sec = mktime( &tm ); \ tv.tv_nsec = 0; \ - assert( tv.tv_sec != -1 ); \ + rtems_test_assert( tv.tv_sec != -1 ); \ \ status = clock_settime( CLOCK_REALTIME, &tv ); \ - assert( !status ); \ + rtems_test_assert( !status ); \ } while ( 0 ) #define print_current_time(s1, s2) \ @@ -77,7 +83,7 @@ struct timespec _tv; \ \ _status = clock_gettime( CLOCK_REALTIME, &_tv ); \ - assert( !_status ); \ + rtems_test_assert( !_status ); \ \ (void) ctime_r( &_tv.tv_sec, _time_buffer ); \ _time_buffer[ strlen( _time_buffer ) - 1 ] = 0; \ diff --git a/testsuites/psxtests/psx01/task.c b/testsuites/psxtests/psx01/task.c index 5943295411..052f4e82a6 100644 --- a/testsuites/psxtests/psx01/task.c +++ b/testsuites/psxtests/psx01/task.c @@ -37,7 +37,7 @@ void *Task_1_through_3( puts( "Task_1: sched_yield to Init" ); status = sched_yield(); - assert( !status ); + rtems_test_assert( !status ); /* switch to Task_1 */ @@ -55,38 +55,38 @@ void *Task_1_through_3( status = pthread_equal( Task_id, Task_id ); if ( status ) puts( "Task_1: pthread_equal - match case passed" ); - assert( status ); + rtems_test_assert( status ); status = pthread_equal( Init_id, Task_id ); if ( !status ) puts( "Task_1: pthread_equal - different case passed" ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: pthread_equal - first id bad" ); status = pthread_equal( (pthread_t) -1, Task_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: pthread_equal - second id bad" ); status = pthread_equal( Init_id, (pthread_t) -1 ); - assert( !status ); + rtems_test_assert( !status ); /* exercise pthread_once */ puts( "Task_1: pthread_once - EINVAL (NULL once_control)" ); status = pthread_once( NULL, Test_init_routine ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Task_1: pthread_once - EINVAL (NULL init_routine)" ); status = pthread_once( &once, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Task_1: pthread_once - SUCCESSFUL (init_routine executes)" ); status = pthread_once( &once, Test_init_routine ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: pthread_once - SUCCESSFUL (init_routine does not execute)" ); status = pthread_once( &once, Test_init_routine ); - assert( !status ); + rtems_test_assert( !status ); puts( "*** END OF POSIX TEST 1 ***" ); rtems_test_exit( 0 ); 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 ); diff --git a/testsuites/psxtests/psx03/init.c b/testsuites/psxtests/psx03/init.c index 40d09fb73a..4efc0d599c 100644 --- a/testsuites/psxtests/psx03/init.c +++ b/testsuites/psxtests/psx03/init.c @@ -58,7 +58,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; @@ -77,17 +77,17 @@ void *POSIX_Init( /* initialize the signal set we will wait for to SIGUSR1 */ status = sigemptyset( &waitset ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &waitset, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); timeout.tv_sec = 3; timeout.tv_nsec = 0; puts( "Init: waiting on any signal for 3 seconds." ); signo = sigtimedwait( &waitset, &siginfo, &timeout ); - assert( signo == -1 ); + rtems_test_assert( signo == -1 ); if ( errno == EAGAIN ) puts( "Init: correctly timed out waiting for SIGUSR1." ); @@ -105,19 +105,19 @@ void *POSIX_Init( /* initialize a mask to block SIGUSR2 */ status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR2 ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: Block SIGUSR2\n" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* create a thread */ status = pthread_create( &Task_id, NULL, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* signal handler is still installed, waitset is still set for SIGUSR1 */ @@ -133,7 +133,7 @@ void *POSIX_Init( puts( "Init: correctly timed out waiting for SIGUSR1." ); else printf( "sigtimedwait returned wrong errno - %d\n", errno ); - assert( signo == -1 ); + rtems_test_assert( signo == -1 ); /* * wait on SIGUSR1 for 3 seconds, Task_2 will send it to us @@ -144,7 +144,7 @@ void *POSIX_Init( /* create a thread */ status = pthread_create( &Task_id, NULL, Task_2, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* signal handler is still installed, waitset is still set for SIGUSR1 */ @@ -162,38 +162,38 @@ void *POSIX_Init( puts( "Init: waiting on any signal for 3 seconds." ); signo = sigtimedwait( &waitset, &siginfo, &timeout ); printf( "Init: received (%d) SIGUSR1=%d\n", siginfo.si_signo, SIGUSR1 ); - assert( signo == SIGUSR1 ); - assert( siginfo.si_signo == SIGUSR1 ); - assert( siginfo.si_code == SI_USER ); - assert( siginfo.si_value.sival_int != -1 ); /* rtems does always set this */ + rtems_test_assert( signo == SIGUSR1 ); + rtems_test_assert( siginfo.si_signo == SIGUSR1 ); + rtems_test_assert( siginfo.si_code == SI_USER ); + rtems_test_assert( siginfo.si_value.sival_int != -1 ); /* rtems does always set this */ /* try out a process signal */ empty_line(); puts( "Init: kill with SIGUSR2." ); status = kill( getpid(), SIGUSR2 ); - assert( !status ); + rtems_test_assert( !status ); siginfo.si_code = -1; siginfo.si_signo = -1; siginfo.si_value.sival_int = -1; status = sigemptyset( &waitset ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &waitset, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &waitset, SIGUSR2 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: waiting on any signal for 3 seconds." ); signo = sigtimedwait( &waitset, &siginfo, &timeout ); printf( "Init: received (%d) SIGUSR2=%d\n", siginfo.si_signo, SIGUSR2 ); - assert( signo == SIGUSR2 ); - assert( siginfo.si_signo == SIGUSR2 ); - assert( siginfo.si_code == SI_USER ); - assert( siginfo.si_value.sival_int != -1 ); /* rtems does always set this */ + rtems_test_assert( signo == SIGUSR2 ); + rtems_test_assert( siginfo.si_signo == SIGUSR2 ); + rtems_test_assert( siginfo.si_code == SI_USER ); + rtems_test_assert( siginfo.si_value.sival_int != -1 ); /* rtems does always set this */ /* exit this thread */ diff --git a/testsuites/psxtests/psx03/task.c b/testsuites/psxtests/psx03/task.c index df3fdaed5d..b4402ee333 100644 --- a/testsuites/psxtests/psx03/task.c +++ b/testsuites/psxtests/psx03/task.c @@ -8,7 +8,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -33,7 +33,7 @@ void *Task_1( puts( "Task_1: pthread_kill - SIGUSR2 to Init" ); status = pthread_kill( Init_id, SIGUSR2 ); - assert( !status ); + rtems_test_assert( !status ); pthread_exit( NULL ); @@ -54,7 +54,7 @@ void *Task_2( puts( "Task_1: pthread_kill - SIGUSR1 to Init" ); status = pthread_kill( Init_id, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); pthread_exit( NULL ); diff --git a/testsuites/psxtests/psx04/init.c b/testsuites/psxtests/psx04/init.c index 93719127d4..e9311b9e16 100644 --- a/testsuites/psxtests/psx04/init.c +++ b/testsuites/psxtests/psx04/init.c @@ -85,44 +85,44 @@ void *POSIX_Init( status = sigwait( NULL, NULL ); if ( status != EINVAL ) printf( "status = %d (%s)\n", status, strerror(status) ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: sigwait - EINVAL (NULL set)" ); status = sigtimedwait( NULL, NULL, NULL ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigwait - EINVAL (NULL set)" ); /* install a signal handler for SIGUSR1 */ status = sigemptyset( &act.sa_mask ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: sigemptyset - set= 0x%08x\n", (unsigned int) act.sa_mask ); /* test sigfillset following the above sigemptyset */ status = sigfillset( &act.sa_mask ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: sigfillset - set= 0x%08x\n", (unsigned int) act.sa_mask ); /* test sigdelset */ status = sigdelset( &act.sa_mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: sigdelset - delete SIGUSR1 set= 0x%08x\n", (unsigned int) act.sa_mask ); /* test sigismember - FALSE */ status = sigismember( &act.sa_mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: sigismember - FALSE since SIGUSR1 is not a member" ); /* test sigismember - TRUE */ status = sigismember( &act.sa_mask, SIGUSR2 ); - assert( status ); + rtems_test_assert( status ); puts( "Init: sigismember - TRUE since SIGUSR2 is a member" ); /* return the set to empty */ @@ -139,7 +139,7 @@ void *POSIX_Init( puts( "Init: send SIGUSR1 to process" ); status = kill( getpid(), SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); /* end of install a signal handler for SIGUSR1 */ @@ -150,10 +150,10 @@ void *POSIX_Init( empty_line(); status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR1" ); act.sa_handler = Signal_handler; @@ -168,7 +168,7 @@ void *POSIX_Init( puts( "Init: send SIGUSR1 to process" ); status = kill( getpid(), SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); Signal_occurred = 0; @@ -177,30 +177,30 @@ void *POSIX_Init( empty_line(); status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR1" ); 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 ); puts( "Init: send SIGUSR1 to process" ); status = kill( getpid(), 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 ); puts( "Init: Unblock SIGUSR1" ); status = sigprocmask( SIG_UNBLOCK, &mask, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* now let another task get interrupted by a signal */ @@ -208,33 +208,33 @@ void *POSIX_Init( puts( "Init: create a thread interested in SIGUSR1" ); status = pthread_create( &Task1_id, NULL, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR1" ); 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 ); puts( "Init: sleep so the other task can block" ); remaining = sleep( 1 ); - assert( !status ); + rtems_test_assert( !status ); /* switch to task 1 */ puts( "Init: send SIGUSR1 to process" ); status = kill( getpid(), 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 ); puts( "Init: sleep so the other task can catch signal" ); remaining = sleep( 1 ); - assert( !status ); + rtems_test_assert( !status ); /* switch to task 1 */ @@ -245,7 +245,7 @@ void *POSIX_Init( /* install a signal handler for SIGALRM and unblock it */ status = sigemptyset( &act.sa_mask ); - assert( !status ); + rtems_test_assert( !status ); act.sa_handler = Signal_handler; act.sa_flags = 0; @@ -253,65 +253,65 @@ void *POSIX_Init( sigaction( SIGALRM, &act, NULL ); status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGALRM ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Unblock SIGALRM" ); status = sigprocmask( SIG_UNBLOCK, &mask, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* schedule the alarm */ puts( "Init: Firing alarm in 5 seconds" ); remaining = alarm( 5 ); printf( "Init: %d seconds left on previous alarm\n", status ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Firing alarm in 2 seconds" ); remaining = alarm( 2 ); printf( "Init: %d seconds left on previous alarm\n", remaining ); - assert( remaining == 5 ); + rtems_test_assert( remaining == 5 ); puts( "Init: Wait 4 seconds for alarm" ); remaining = sleep( 4 ); printf( "Init: %d seconds left in sleep\n", remaining ); - assert( remaining == 2 ); + rtems_test_assert( remaining == 2 ); /* test SIG_SETMASK case and returning oset of pthread_sigmask */ empty_line(); status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR2 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR1 and SIGUSR2 only" ); status = pthread_sigmask( SIG_SETMASK, &mask, &oset ); printf( "Init: Previous blocked set was 0x%08x\n", (unsigned int) oset ); - assert( !status ); + rtems_test_assert( !status ); /* test inquiry about current blocked set with pthread_sigmask */ status = pthread_sigmask( 0, NULL, &oset ); printf( "Init: Current blocked set is 0x%08x\n", (unsigned int) oset ); - assert( !status ); + rtems_test_assert( !status ); /* return blocked mask to no signals blocked */ status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Unblock all signals" ); status = pthread_sigmask( SIG_SETMASK, &mask, &oset ); printf( "Init: Previous blocked set was 0x%08x\n", (unsigned int) oset ); - assert( !status ); + rtems_test_assert( !status ); /* test sigsuspend */ @@ -319,14 +319,14 @@ void *POSIX_Init( puts( "Init: create a thread to send Init SIGUSR1" ); status = pthread_create( &Task2_id, NULL, Task_2, NULL ); - assert( !status ); + rtems_test_assert( !status ); status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: sigsuspend for any signal" ); status = sigsuspend( &mask ); - assert( status ); + rtems_test_assert( status ); printf( "Init: awakended from sigsuspend status=%08d \n", status ); /* test a SIGINFO case, these are signals sent to a process only */ @@ -335,7 +335,7 @@ void *POSIX_Init( puts( "Init: create a thread to sent Process SIGUSR1 with SA_SIGINFO" ); status = pthread_create( &Task3_id, NULL, Task_3, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* set action on SIGUSR1 to an info case */ act.sa_handler = Signal_handler; @@ -346,7 +346,7 @@ void *POSIX_Init( puts( "Init: sleep so the Task_3 can sigqueue SIGUSR1" ); remaining = sleep( 1 ); - assert( !status ); + rtems_test_assert( !status ); /* switch to task 1 */ @@ -355,68 +355,68 @@ void *POSIX_Init( /* Send SIGUSR1, Task_3 has issued a sigwaitinfo */ status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR1" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: send SIGUSR1 to process" ); status = kill( getpid(), SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: sleep so the Task_3 can receive SIGUSR1" ); remaining = sleep( 1 ); - assert( !status ); + rtems_test_assert( !status ); /* Send SIGUSR1, Task_3 has issued a sigwait */ status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR1" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: send SIGUSR1 to process" ); status = kill( getpid(), SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: sleep so the Task_3 can receive SIGUSR1" ); remaining = sleep( 1 ); - assert( !status ); + rtems_test_assert( !status ); /* Send SIGUSR1, Task_3 has issued a sigwaitinfo */ status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR2 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR2" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: send SIGUSR2 to process" ); status = kill( getpid(), SIGUSR2 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: sleep so the Task_3 can receive SIGUSR2" ); remaining = sleep( 1 ); - assert( !status ); + rtems_test_assert( !status ); /* Suspend for signal that has already be sent */ puts( "Init: sigsuspend for any signal" ); status = sigsuspend( &mask ); - assert( status ); + rtems_test_assert( status ); printf( "Init: awakended from sigsuspend status=%d \n", status ); /* generate error cases for psignal */ @@ -426,156 +426,156 @@ void *POSIX_Init( status = sigemptyset( NULL ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigemptyset - EINVAL (set invalid)" ); status = sigfillset( NULL ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigfillset - EINVAL (set invalid)" ); status = sigaddset( NULL, SIGUSR1 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigaddset - EINVAL (set invalid)" ); status = sigaddset( &mask, 0 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigaddset - EINVAL (signal = 0)" ); status = sigaddset( &mask, 999 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigaddset - EINVAL (set invalid)" ); status = sigdelset( NULL, SIGUSR1 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigdelset - EINVAL (set invalid)" ); status = sigdelset( &mask, 0 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: sigdelset - SUCCESSFUL (signal = 0)" ); status = sigdelset( &mask, 999 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigdelset - EINVAL (set invalid)" ); status = sigismember( NULL, SIGUSR1 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigismember - EINVAL (set invalid)" ); status = sigismember( &mask, 0 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: sigismember - SUCCESSFUL (signal = 0)" ); status = sigismember( &mask, 999 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigismember - EINVAL (signal invalid)" ); status = sigaction( 0, &act, 0 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigaction - EINVAL (signal = 0)" ); status = sigaction( 999, &act, NULL ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigaction - EINVAL (signal invalid)" ); status = sigaction( SIGKILL, &act, NULL ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigaction - EINVAL (SIGKILL)" ); status = pthread_sigmask( SIG_BLOCK, NULL, NULL ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: pthread_sigmask - EINVAL (set and oset invalid)" ); status = pthread_sigmask( 999, &pending_set, NULL ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: pthread_sigmask - EINVAL (how invalid)" ); status = sigpending( NULL ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigpending - EINVAL (set invalid)" ); timeout.tv_nsec = -1; status = sigtimedwait( &mask, &info, &timeout ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: pthread_sigmask - EINVAL (timout->nsec invalid < 0)" ); timeout.tv_nsec = 0x7fffffff; status = sigtimedwait( &mask, &info, &timeout ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: pthread_sigmask - EINVAL (timout->nsec invalid to large)" ); status = pthread_kill( Init_id, 999 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: pthread_kill - EINVAL (sig invalid)" ); status = pthread_kill( 0, SIGUSR2 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == ESRCH ); + rtems_test_assert( errno == ESRCH ); puts( "Init: pthread_kill - ESRCH (signal SA_SIGINFO)" ); status = pthread_kill( Init_id, 0 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: pthread_kill - EINVAL (signal = 0)" ); act.sa_handler = SIG_IGN; act.sa_flags = 0; sigaction( SIGUSR2, &act, NULL ); status = pthread_kill( Init_id, SIGUSR2 ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_kill - SUCCESSFUL (signal = SIG_IGN)" ); status = kill( INT_MAX, SIGUSR1 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == ESRCH ); + rtems_test_assert( errno == ESRCH ); puts( "Init: kill - ESRCH (pid invalid)" ); status = kill( getpid(), 0 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: kill - EINVAL (signal = 0)" ); status = kill( getpid(), 999 ); if ( status != -1 ) printf( "status = %d\n", status ); - assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: kill - EINVAL (sig invalid)" ); /* exit this thread */ diff --git a/testsuites/psxtests/psx04/task1.c b/testsuites/psxtests/psx04/task1.c index 046ece1476..53d5dc877d 100644 --- a/testsuites/psxtests/psx04/task1.c +++ b/testsuites/psxtests/psx04/task1.c @@ -30,7 +30,7 @@ void *Task_1( seconds = sleep( 5 ); printf( "Task_1: %d seconds left\n", seconds ); - assert( seconds ); + rtems_test_assert( seconds ); /* switch to Init */ diff --git a/testsuites/psxtests/psx04/task2.c b/testsuites/psxtests/psx04/task2.c index 82291b804a..38af348d48 100644 --- a/testsuites/psxtests/psx04/task2.c +++ b/testsuites/psxtests/psx04/task2.c @@ -7,7 +7,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -28,7 +28,7 @@ void *Task_2( printf( "Task_2: sending SIGUSR1\n" ); status = pthread_kill( Init_id, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); /* switch to Init */ diff --git a/testsuites/psxtests/psx04/task3.c b/testsuites/psxtests/psx04/task3.c index da4fb44e53..c411f39a6d 100644 --- a/testsuites/psxtests/psx04/task3.c +++ b/testsuites/psxtests/psx04/task3.c @@ -35,24 +35,24 @@ void *Task_3( printf( "Task_3: sigqueue SIGUSR1 with value= %d\n", value.sival_int ); status = sigqueue( getpid(), SIGUSR1, value ); - assert( !status ); + rtems_test_assert( !status ); /* catch signal with sigwaitinfo */ empty_line(); status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); printf( "Task_3: sigwaitinfo SIGUSR1 with value= %d\n", value.sival_int ); status = sigwaitinfo( &mask, &info ); /* switch to Init */ - assert( !(status==-1) ); + rtems_test_assert( !(status==-1) ); printf( "Task_3: si_signo= %d si_code= %d value= %d\n", info.si_signo, @@ -65,17 +65,17 @@ void *Task_3( empty_line(); status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); printf( "Task_3: sigwait SIGUSR1\n" ); status = sigwait( &mask, &sig ); /* switch to Init */ - assert( !status ); + rtems_test_assert( !status ); printf( "Task_3: signo= %d\n", sig ); /* catch signal with pause */ @@ -83,17 +83,17 @@ void *Task_3( empty_line(); status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); printf( "Task_3: pause\n" ); status = pause( ); /* switch to Init */ - assert( !(status==-1) ); + rtems_test_assert( !(status==-1) ); printf( "Task_3: pause= %d\n", status ); @@ -103,11 +103,11 @@ void *Task_3( printf( "Task_3: sending SIGUSR2\n" ); status = pthread_kill( Init_id, SIGUSR2 ); - assert( !status ); + rtems_test_assert( !status ); printf( "Task_3: sleep so the Init task can reguest a signal\n" ); remaining = sleep( 1 ); - assert( !status ); + rtems_test_assert( !status ); /* end of task 3 */ printf( "Task_3: exit\n" ); diff --git a/testsuites/psxtests/psx05/init.c b/testsuites/psxtests/psx05/init.c index b8e3fc2a0f..bb75855e6b 100644 --- a/testsuites/psxtests/psx05/init.c +++ b/testsuites/psxtests/psx05/init.c @@ -42,7 +42,7 @@ void Print_mutexattr( /* protocol */ status = pthread_mutexattr_getprotocol( attr, &protocol ); - assert( !status ); + rtems_test_assert( !status ); printf( "%smutex protocol is (%d) -- ", msg, protocol ); switch ( protocol ) { @@ -57,20 +57,20 @@ void Print_mutexattr( break; default: puts( "UNKNOWN" ); - assert( 0 ); + rtems_test_assert( 0 ); break; } /* priority ceiling */ status = pthread_mutexattr_getprioceiling( attr, &prioceiling ); - assert( !status ); + rtems_test_assert( !status ); printf( "%smutex priority ceiling is %d\n", msg, prioceiling ); /* process shared */ status = pthread_mutexattr_getpshared( attr, &pshared ); - assert( !status ); + rtems_test_assert( !status ); printf( "%smutex process shared is (%d) -- ", msg, pshared ); switch ( pshared ) { case PTHREAD_PROCESS_PRIVATE: @@ -81,7 +81,7 @@ void Print_mutexattr( break; default: puts( "UNKNOWN" ); - assert( 0 ); + rtems_test_assert( 0 ); break; } } @@ -123,7 +123,7 @@ void *POSIX_Init( int old_ceiling; int priority; - assert( MUTEX_BAD_ID != PTHREAD_MUTEX_INITIALIZER ); + rtems_test_assert( MUTEX_BAD_ID != PTHREAD_MUTEX_INITIALIZER ); Mutex_bad_id = MUTEX_BAD_ID; puts( "\n\n*** POSIX TEST 5 ***" ); @@ -141,30 +141,30 @@ void *POSIX_Init( puts( "Init: pthread_mutexattr_init - EINVAL (NULL attr)" ); status = pthread_mutexattr_init( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_init - SUCCESSFUL" ); status = pthread_mutexattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); Print_mutexattr( "Init: ", &attr ); /* create an "uninitialized" attribute structure */ status = pthread_mutexattr_init( &destroyed_attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutexattr_destroy - SUCCESSFUL" ); status = pthread_mutexattr_destroy( &destroyed_attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutexattr_destroy - EINVAL (NULL attr)" ); status = pthread_mutexattr_destroy( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_destroy - EINVAL (not initialized)" ); status = pthread_mutexattr_destroy( &destroyed_attr ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* error cases for set and get pshared attribute */ @@ -172,25 +172,25 @@ void *POSIX_Init( puts( "Init: pthread_mutexattr_getpshared - EINVAL (NULL attr)" ); status = pthread_mutexattr_getpshared( NULL, &pshared ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getpshared - EINVAL (NULL pshared)" ); status = pthread_mutexattr_getpshared( &attr, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getpshared - EINVAL (not initialized)" ); status = pthread_mutexattr_getpshared( &destroyed_attr, &pshared ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); pshared = PTHREAD_PROCESS_PRIVATE; puts( "Init: pthread_mutexattr_setpshared - EINVAL (NULL attr)" ); status = pthread_mutexattr_setpshared( NULL, pshared ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); pshared = PTHREAD_PROCESS_PRIVATE; puts( "Init: pthread_mutexattr_setpshared - EINVAL (not initialized)" ); status = pthread_mutexattr_setpshared( &destroyed_attr, pshared ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* error cases for set and get protocol attribute */ @@ -198,27 +198,27 @@ void *POSIX_Init( puts( "Init: pthread_mutexattr_getprotocol - EINVAL (NULL attr)" ); status = pthread_mutexattr_getprotocol( NULL, &protocol ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getprotocol - EINVAL (NULL protocol)" ); status = pthread_mutexattr_getprotocol( &attr, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getprotocol - EINVAL (not initialized)" ); status = pthread_mutexattr_getprotocol( &destroyed_attr, &protocol ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprotocol - EINVAL (NULL attr)" ); status = pthread_mutexattr_setprotocol( NULL, PTHREAD_PRIO_NONE ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprotocol - EINVAL (invalid protocol)" ); status = pthread_mutexattr_setprotocol( &attr, -1 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprotocol - EINVAL (not initialized)" ); status = pthread_mutexattr_setprotocol( &destroyed_attr, -1 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* error cases for set and get prioceiling attribute */ @@ -226,34 +226,34 @@ void *POSIX_Init( puts( "Init: pthread_mutexattr_getprioceiling - EINVAL (NULL attr)" ); status = pthread_mutexattr_getprioceiling( NULL, &ceiling ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getprioceiling - EINVAL (NULL prioceiling)" ); status = pthread_mutexattr_getprioceiling( &attr, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getprioceiling - EINVAL (not initialized)" ); status = pthread_mutexattr_getprioceiling( &destroyed_attr, &ceiling ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprioceiling - EINVAL (NULL attr)" ); status = pthread_mutexattr_setprioceiling( NULL, 128 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprioceiling - EINVAL (invalid priority)" ); status = pthread_mutexattr_setprioceiling( &attr, 512 ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprioceiling - EINVAL (not initialized)" ); status = pthread_mutexattr_setprioceiling( &destroyed_attr, -1 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* create a thread */ status = pthread_create( &Task_id, NULL, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* now try some basic mutex operations */ @@ -261,18 +261,18 @@ void *POSIX_Init( puts( "Init: pthread_mutex_init - EINVAL (NULL mutex_id)" ); status = pthread_mutex_init( NULL, &attr ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutex_init - EINVAL (not initialized attr)" ); status = pthread_mutex_init( &Mutex_id, &destroyed_attr ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* must get around error checks in attribute set routines */ attr.protocol = -1; puts( "Init: pthread_mutex_init - EINVAL (bad protocol)" ); status = pthread_mutex_init( &Mutex_id, &attr ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* must get around error checks in attribute set routines */ attr.protocol = PTHREAD_PRIO_INHERIT; @@ -280,56 +280,56 @@ void *POSIX_Init( puts( "Init: pthread_mutex_init - EINVAL (bad priority ceiling)" ); status = pthread_mutex_init( &Mutex_id, &attr ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* must get around various error checks before checking bad scope */ puts( "Init: Resetting mutex attributes" ); status = pthread_mutexattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - ENOSYS (process wide scope)" ); attr.process_shared = PTHREAD_PROCESS_SHARED; status = pthread_mutex_init( &Mutex_id, &attr ); - assert( status == ENOSYS ); + rtems_test_assert( status == ENOSYS ); puts( "Init: pthread_mutex_init - EINVAL (invalid scope)" ); attr.process_shared = -1; status = pthread_mutex_init( &Mutex_id, &attr ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* bad kind */ status = pthread_mutexattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - EINVAL (invalid type)" ); attr.type = -1; status = pthread_mutex_init( &Mutex_id, &attr ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* now set up for a success pthread_mutex_init */ puts( "Init: Resetting mutex attributes" ); status = pthread_mutexattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Changing mutex attributes" ); status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_mutexattr_setprioceiling( &attr, (sched_get_priority_max(SCHED_FIFO) / 2) + 1 ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_mutexattr_setpshared( &attr, PTHREAD_PROCESS_SHARED ); - assert( !status ); + rtems_test_assert( !status ); Print_mutexattr( "Init: ", &attr ); puts( "Init: Resetting mutex attributes" ); status = pthread_mutexattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); /* * Set the protocol to priority ceiling so the owner check happens @@ -337,13 +337,13 @@ void *POSIX_Init( */ status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - SUCCESSFUL" ); status = pthread_mutex_init( &Mutex_id, &attr ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); /* * This is not required to be an error and when it is, there are @@ -355,44 +355,44 @@ void *POSIX_Init( status = pthread_mutex_init( &Mutex_id, &attr ); if ( !status ) printf( "status = %d\n", status ); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); #endif puts( "Init: pthread_mutex_trylock - EINVAL (illegal ID)" ); status = pthread_mutex_trylock( &Mutex_bad_id ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutex_trylock - SUCCESSFUL" ); status = pthread_mutex_trylock( &Mutex_id ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_trylock - EDEADLK (already locked)" ); status = pthread_mutex_trylock( &Mutex_id ); if ( status != EDEADLK ) printf( "status = %d\n", status ); - assert( status == EDEADLK ); + rtems_test_assert( status == EDEADLK ); puts( "Init: pthread_mutex_lock - EINVAL (NULL id)" ); status = pthread_mutex_lock( NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutex_unlock - EINVAL (NULL id)" ); status = pthread_mutex_unlock( NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutex_lock - EDEADLK (already locked)" ); status = pthread_mutex_lock( &Mutex_id ); if ( status != EDEADLK ) printf( "status = %d\n", status ); - assert( status == EDEADLK ); + rtems_test_assert( status == EDEADLK ); puts( "Init: Sleep 1 second" ); @@ -404,19 +404,19 @@ void *POSIX_Init( status = pthread_mutex_unlock( &Mutex_bad_id ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutex_unlock - SUCCESSFUL" ); status = pthread_mutex_unlock( &Mutex_id ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_unlock - EPERM (not owner)" ); status = pthread_mutex_unlock( &Mutex_id ); if ( status != EPERM ) printf( "status = %d\n", status ); - assert( status == EPERM ); + rtems_test_assert( status == EPERM ); puts( "Init: pthread_mutex_timedlock - time out in 1/2 second" ); calculate_abstimeout( ×, 0, (TOD_NANOSECONDS_PER_SECOND / 2) ); @@ -424,7 +424,7 @@ void *POSIX_Init( status = pthread_mutex_timedlock( &Mutex_id, × ); if ( status != ETIMEDOUT ) printf( "status = %d\n", status ); - assert( status == ETIMEDOUT ); + rtems_test_assert( status == ETIMEDOUT ); puts( "Init: pthread_mutex_timedlock - time out in the past" ); calculate_abstimeout( ×, -1, (TOD_NANOSECONDS_PER_SECOND / 2) ); @@ -432,7 +432,7 @@ void *POSIX_Init( status = pthread_mutex_timedlock( &Mutex_id, × ); if ( status != EBUSY ) printf( "status = %d\n", status ); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); /* switch to idle */ @@ -446,23 +446,23 @@ void *POSIX_Init( status = pthread_mutex_init( &Mutex2_id, &attr ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - EAGAIN (too many)" ); status = pthread_mutex_init( &Mutex3_id, &attr ); - assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); puts( "Init: pthread_mutexattr_destroy - SUCCESSFUL" ); status = pthread_mutexattr_destroy( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_destroy - SUCCESSFUL" ); status = pthread_mutex_destroy( &Mutex2_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_destroy - EINVAL (invalid id)" ); status = pthread_mutex_destroy( &Mutex_bad_id ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* destroy a busy mutex */ @@ -470,31 +470,31 @@ void *POSIX_Init( puts( "Init: pthread_mutexattr_init - SUCCESSFUL" ); status = pthread_mutexattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - SUCCESSFUL" ); status = pthread_mutex_init( &Mutex2_id, &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_trylock - SUCCESSFUL" ); status = pthread_mutex_trylock( &Mutex2_id ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_destroy - EBUSY (already locked)" ); status = pthread_mutex_destroy( &Mutex2_id ); if ( status != EBUSY ) printf( "status = %d\n", status ); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); puts( "Init: pthread_mutex_unlock - SUCCESSFUL" ); status = pthread_mutex_unlock( &Mutex2_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_destroy - SUCCESSFUL" ); status = pthread_mutex_destroy( &Mutex2_id ); - assert( !status ); + rtems_test_assert( !status ); /* priority inherit mutex */ @@ -502,26 +502,26 @@ void *POSIX_Init( puts( "Init: pthread_mutexattr_init - SUCCESSFUL" ); status = pthread_mutexattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutexattr_setprotocol - SUCCESSFUL (PTHREAD_PRIO_INHERIT)" ); status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - SUCCESSFUL" ); status = pthread_mutex_init( &Mutex2_id, &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_trylock - SUCCESSFUL" ); status = pthread_mutex_trylock( &Mutex2_id ); - assert( !status ); + rtems_test_assert( !status ); /* create a thread at a lower priority */ status = pthread_create( &Task2_id, NULL, Task_2, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* set priority of Task2 to highest priority */ @@ -529,25 +529,25 @@ void *POSIX_Init( puts( "Init: pthread_setschedparam - Setting Task2 priority to highest" ); status = pthread_setschedparam( Task2_id, SCHED_FIFO, ¶m ); - assert( !status ); + rtems_test_assert( !status ); /* switching to Task2 */ status = pthread_getschedparam( pthread_self(), &policy, ¶m ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: pthread_getschedparam - priority = %d\n", param.sched_priority); puts( "Init: pthread_mutex_unlock - SUCCESSFUL" ); status = pthread_mutex_unlock( &Mutex2_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutexattr_destroy - SUCCESSFUL" ); status = pthread_mutexattr_destroy( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_destroy - SUCCESSFUL" ); status = pthread_mutex_destroy( &Mutex2_id ); - assert( !status ); + rtems_test_assert( !status ); /* priority ceiling mutex */ @@ -555,41 +555,41 @@ void *POSIX_Init( puts( "Init: pthread_mutexattr_init - SUCCESSFUL" ); status = pthread_mutexattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutexattr_setprotocol - SUCCESSFUL (PTHREAD_PRIO_PROTECT)" ); status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_PROTECT ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - SUCCESSFUL" ); status = pthread_mutex_init( &Mutex2_id, &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_getprioceiling - EINVAL (invalid id)" ); status = pthread_mutex_getprioceiling( &Mutex_bad_id, &ceiling ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutex_getprioceiling - EINVAL (NULL ceiling)" ); status = pthread_mutex_getprioceiling( &Mutex2_id, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); status = pthread_mutex_getprioceiling( &Mutex2_id, &ceiling ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: pthread_mutex_getprioceiling - %d\n", ceiling ); puts( "Init: pthread_mutex_setprioceiling - EINVAL (invalid id)" ); status = pthread_mutex_setprioceiling( &Mutex_bad_id, 200, &old_ceiling ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutex_setprioceiling - EINVAL (illegal priority)" ); status = pthread_mutex_setprioceiling( &Mutex2_id, 512, &old_ceiling ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutex_setprioceiling - EINVAL (NULL ceiling)" ); status = pthread_mutex_setprioceiling( &Mutex2_id, 128, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* normal cases of set priority ceiling */ @@ -598,23 +598,23 @@ void *POSIX_Init( printf( "Init: pthread_mutex_setprioceiling - new ceiling = %d\n", priority ); status = pthread_mutex_setprioceiling( &Mutex2_id, priority, &old_ceiling ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: pthread_mutex_setprioceiling - old ceiling = %d\n",old_ceiling ); status = pthread_getschedparam( pthread_self(), &policy, ¶m ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: pthread_getschedparam - priority = %d\n", param.sched_priority ); puts( "Init: pthread_mutex_trylock - SUCCESSFUL" ); status = pthread_mutex_trylock( &Mutex2_id ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_getschedparam( pthread_self(), &policy, ¶m ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: pthread_getschedparam - priority = %d\n", param.sched_priority ); @@ -622,30 +622,30 @@ void *POSIX_Init( /* create a thread at a higher priority */ status = pthread_create( &Task3_id, NULL, Task_3, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* set priority of Task3 to highest priority */ param.sched_priority = --priority; status = pthread_setschedparam( Task3_id, SCHED_FIFO, ¶m ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_setschedparam - set Task3 priority to highest" ); /* DOES NOT SWITCH to Task3 */ puts( "Init: Sleep 1 second" ); - assert( !status ); + rtems_test_assert( !status ); sleep( 1 ); /* switch to task 3 */ puts( "Init: pthread_mutex_unlock - SUCCESSFUL" ); status = pthread_mutex_unlock( &Mutex2_id ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_mutex_getprioceiling( &Mutex2_id, &ceiling ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: pthread_mutex_getprioceiling- ceiling = %d\n", ceiling ); /* set priority of Init to highest priority */ @@ -653,14 +653,14 @@ void *POSIX_Init( param.sched_priority = sched_get_priority_max(SCHED_FIFO); status = pthread_setschedparam( Init_id, SCHED_FIFO, ¶m ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_setschedparam - set Init priority to highest" ); puts( "Init: pthread_mutex_lock - EINVAL (priority ceiling violation)" ); status = pthread_mutex_lock( &Mutex2_id ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* mutexinit.c: Initialising recursive mutex */ @@ -678,7 +678,7 @@ void *POSIX_Init( status = pthread_mutex_init( &Mutex2_id, &attr ); if ( status ) printf( "status recursive mutex :%d\n", status ); - assert( !status ); + rtems_test_assert( !status ); puts( "*** END OF POSIX TEST 5 ***" ); rtems_test_exit( 0 ); diff --git a/testsuites/psxtests/psx05/task.c b/testsuites/psxtests/psx05/task.c index b5d54aa96c..7ba54ae36e 100644 --- a/testsuites/psxtests/psx05/task.c +++ b/testsuites/psxtests/psx05/task.c @@ -8,7 +8,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -31,13 +31,13 @@ void *Task_1( status = pthread_mutex_trylock( &Mutex_id ); if ( status != EBUSY ) printf( "status = %d\n", status ); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); printf( "Task: pthread_mutex_lock unavailable\n" ); status = pthread_mutex_lock( &Mutex_id ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); /* switch to init */ diff --git a/testsuites/psxtests/psx05/task2.c b/testsuites/psxtests/psx05/task2.c index 1c744b3660..0e73fe23ec 100644 --- a/testsuites/psxtests/psx05/task2.c +++ b/testsuites/psxtests/psx05/task2.c @@ -7,7 +7,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -30,14 +30,14 @@ void *Task_2( status = pthread_mutex_lock( &Mutex2_id ); if ( status ) printf( "status =%d\n", status ); - assert( !status ); + rtems_test_assert( !status ); printf( "Task 2: mutex acquired\n" ); /* switch to init */ printf( "Task 2: unlock Mutex 2\n" ); status = pthread_mutex_unlock( &Mutex2_id ); - assert( !status ); + rtems_test_assert( !status ); printf( "Task 2: exit\n" ); pthread_exit( NULL ); diff --git a/testsuites/psxtests/psx05/task3.c b/testsuites/psxtests/psx05/task3.c index d5bb8bf30f..2f2cf0eb45 100644 --- a/testsuites/psxtests/psx05/task3.c +++ b/testsuites/psxtests/psx05/task3.c @@ -7,7 +7,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -31,14 +31,14 @@ void *Task_3( printf( "Task 3: pthread_mutex_lock unavailable (inherit case)\n" ); status = pthread_mutex_lock( &Mutex2_id ); printf( "Task 3: mutex acquired\n" ); - assert( !status ); + rtems_test_assert( !status ); printf( "Task 3: unlock Mutex 2\n" ); status = pthread_mutex_unlock( &Mutex2_id ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_getschedparam( pthread_self(), &policy, ¶m ); - assert( !status ); + rtems_test_assert( !status ); printf( "Task 3: pthread_getschedparam priority = %d\n", param.sched_priority ); printf( "Task 3: exit\n" ); diff --git a/testsuites/psxtests/psx06/init.c b/testsuites/psxtests/psx06/init.c index eab79e3d39..7d19e3f7a2 100644 --- a/testsuites/psxtests/psx06/init.c +++ b/testsuites/psxtests/psx06/init.c @@ -52,10 +52,10 @@ void *POSIX_Init( /* create a couple of threads */ status = pthread_create( &Task_id, NULL, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_create( &Task2_id, NULL, Task_2, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* create a key */ @@ -66,31 +66,31 @@ void *POSIX_Init( status = pthread_key_create( &Key_id, Key_destructor ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); printf( "Destructor invoked %d times\n", Destructor_invoked ); puts( "Init: pthread_key_create - EAGAIN (too many keys)" ); status = pthread_key_create( &Key_id, Key_destructor ); - assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); puts( "Init: pthread_setspecific - EINVAL (invalid key)" ); status = pthread_setspecific( (pthread_t) -1, &Data_array[ 0 ] ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_getspecific - EINVAL (invalid key)" ); key_data = pthread_getspecific( (pthread_t) -1 ); - assert( !key_data ); + rtems_test_assert( !key_data ); puts( "Init: pthread_key_delete - EINVAL (invalid key)" ); status = pthread_key_delete( (pthread_t) -1 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); printf( "Init: Setting the key to %d\n", 0 ); status = pthread_setspecific( Key_id, &Data_array[ 0 ] ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); /* switch to task 1 */ @@ -101,7 +101,7 @@ void *POSIX_Init( remaining = sleep( 3 ); if ( remaining ) printf( "seconds remaining = %d\n", remaining ); - assert( !remaining ); + rtems_test_assert( !remaining ); /* switch to task 1 */ @@ -111,7 +111,7 @@ void *POSIX_Init( status = pthread_key_delete( Key_id ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); printf( "Destructor invoked %d times\n", Destructor_invoked ); diff --git a/testsuites/psxtests/psx06/task.c b/testsuites/psxtests/psx06/task.c index 8284ed6119..e29f823374 100644 --- a/testsuites/psxtests/psx06/task.c +++ b/testsuites/psxtests/psx06/task.c @@ -8,7 +8,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -32,14 +32,14 @@ void *Task_1( status = pthread_setspecific( Key_id, &Data_array[ 1 ] ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); key_data = pthread_getspecific( Key_id ); printf( "Task_1: Got the key value of %ld\n", (unsigned long) ((uint32_t *)key_data - Data_array) ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: exitting" ); pthread_exit( NULL ); diff --git a/testsuites/psxtests/psx06/task2.c b/testsuites/psxtests/psx06/task2.c index e894e40a1d..de981e5a26 100644 --- a/testsuites/psxtests/psx06/task2.c +++ b/testsuites/psxtests/psx06/task2.c @@ -7,7 +7,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -33,14 +33,14 @@ void *Task_2( status = pthread_setspecific( Key_id, &Data_array[ 2 ] ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); key_data = pthread_getspecific( Key_id ); printf( "Task_2: Got the key value of %ld\n", (unsigned long) ((uint32_t *)key_data - Data_array) ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task2: exitting" ); pthread_exit( NULL ); diff --git a/testsuites/psxtests/psx07/init.c b/testsuites/psxtests/psx07/init.c index d5ba806f66..f075beff90 100644 --- a/testsuites/psxtests/psx07/init.c +++ b/testsuites/psxtests/psx07/init.c @@ -582,7 +582,7 @@ void *POSIX_Init( puts( "Init - pthread_attr_setinheritsched - EXPLICIT - SUCCESSFUL" ); status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); - assert( !status ); + rtems_test_assert( !status ); schedparam.ss_replenish_period.tv_sec = 3; schedparam.ss_replenish_period.tv_nsec = 3; @@ -599,7 +599,7 @@ void *POSIX_Init( posix_service_failed( status, "pthread_attr_setschedparam"); status = pthread_create( &Task2_id, &attr, Task_2, NULL ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_join( Task2_id, NULL ); posix_service_failed( status, " pthread_join"); diff --git a/testsuites/psxtests/psx08/init.c b/testsuites/psxtests/psx08/init.c index 827014604d..ec68b0c5fe 100644 --- a/testsuites/psxtests/psx08/init.c +++ b/testsuites/psxtests/psx08/init.c @@ -33,22 +33,22 @@ void *POSIX_Init( puts( "Init: pthread_detach - ESRCH (invalid id)" ); status = pthread_detach( (pthread_t) -1 ); - assert( status == ESRCH ); + rtems_test_assert( status == ESRCH ); /* detach this thread */ puts( "Init: pthread_detach self" ); status = pthread_detach( pthread_self() ); - assert( !status ); + rtems_test_assert( !status ); /* create thread */ status = pthread_create( &Task1_id, NULL, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_join - ESRCH (invalid id)" ); status = pthread_join( (pthread_t) -1, &return_pointer ); - assert( status == ESRCH ); + rtems_test_assert( status == ESRCH ); puts( "Init: pthread_join - SUCCESSFUL" ); status = pthread_join( Task1_id, &return_pointer ); @@ -56,7 +56,7 @@ void *POSIX_Init( puts( "Init: returned from pthread_join through return" ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); if ( return_pointer == &Task1_id ) puts( "Init: pthread_join returned correct pointer" ); @@ -69,10 +69,10 @@ void *POSIX_Init( puts( "Init: creating two pthreads" ); status = pthread_create( &Task2_id, NULL, Task_2, NULL ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_create( &Task3_id, NULL, Task_3, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_join - SUCCESSFUL" ); status = pthread_join( Task2_id, &return_pointer ); @@ -81,7 +81,7 @@ void *POSIX_Init( puts( "Init: returned from pthread_join through pthread_exit" ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); if ( return_pointer == &Task2_id ) puts( "Init: pthread_join returned correct pointer" ); diff --git a/testsuites/psxtests/psx08/task2.c b/testsuites/psxtests/psx08/task2.c index d7f8fc003c..612176404f 100644 --- a/testsuites/psxtests/psx08/task2.c +++ b/testsuites/psxtests/psx08/task2.c @@ -8,7 +8,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -37,13 +37,13 @@ void *Task_2( status = pthread_join( Init_id, NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Task_2: join to self task (Init) -- EDEADLK" ); status = pthread_join( pthread_self(), NULL ); if ( status != EDEADLK ) printf( "status = %d\n", status ); - assert( status == EDEADLK ); + rtems_test_assert( status == EDEADLK ); puts( "Task_2: exitting" ); diff --git a/testsuites/psxtests/psx08/task3.c b/testsuites/psxtests/psx08/task3.c index 24aa724fc7..e09c239e38 100644 --- a/testsuites/psxtests/psx08/task3.c +++ b/testsuites/psxtests/psx08/task3.c @@ -8,7 +8,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -33,7 +33,7 @@ void *Task_3( puts( "Task_3: returned from pthread_join" ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); if ( return_pointer == &Task2_id ) puts( "Task_3: pthread_join returned correct pointer" ); diff --git a/testsuites/psxtests/psx09/init.c b/testsuites/psxtests/psx09/init.c index bb47925221..ca4c5c99ee 100644 --- a/testsuites/psxtests/psx09/init.c +++ b/testsuites/psxtests/psx09/init.c @@ -72,7 +72,7 @@ void *POSIX_Init( puts( "Init: pthread_getschedparam - SUCCESSFUL" ); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - current priority = %d", priority ); @@ -88,10 +88,10 @@ void *POSIX_Init( puts( "Init: pthread_setschedparam - SUCCESSFUL (sporadic server)" ); status = pthread_setschedparam( pthread_self(), SCHED_SPORADIC, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - new priority = %d", priority ); @@ -101,7 +101,7 @@ void *POSIX_Init( for ( passes=0 ; passes <= 3 ; ) { status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); if ( priority != schedparam.sched_priority ) { priority = schedparam.sched_priority; @@ -116,7 +116,7 @@ void *POSIX_Init( empty_line(); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); schedparam.ss_replenish_period.tv_sec = 0; schedparam.ss_replenish_period.tv_nsec = 500000000; /* 1/2 second */ @@ -132,23 +132,23 @@ void *POSIX_Init( puts( "Init: pthread_setschedparam - SUCCESSFUL (sporadic server)" ); status = pthread_setschedparam( pthread_self(), SCHED_SPORADIC, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Initializing mutex attributes for priority ceiling" ); status = pthread_mutexattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Creating a mutex" ); status = pthread_mutex_init( &Mutex_id, &attr ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - new priority = %d", priority ); @@ -162,11 +162,11 @@ void *POSIX_Init( status = pthread_mutex_lock( &Mutex_id ); if ( status ) printf( "status = %d %s\n", status, strerror(status) ); - assert( !status ); + rtems_test_assert( !status ); for ( ; ; ) { status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); if ( schedparam.sched_priority == LOW_PRIORITY ) { puts( "ERROR - Init's priority lowered while holding mutex" ); @@ -182,7 +182,7 @@ void *POSIX_Init( print_current_time( "Init: ", buffer ); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - new priority = %d", priority ); @@ -197,10 +197,10 @@ void *POSIX_Init( status = pthread_mutex_unlock( &Mutex_id ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - new priority = %d", priority ); @@ -208,14 +208,14 @@ void *POSIX_Init( for ( ; ; ) { status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); if ( schedparam.sched_priority == LOW_PRIORITY ) break; } status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - new priority = %d", priority ); diff --git a/testsuites/psxtests/psx10/init.c b/testsuites/psxtests/psx10/init.c index a0b80ad29b..488a501adf 100644 --- a/testsuites/psxtests/psx10/init.c +++ b/testsuites/psxtests/psx10/init.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -29,61 +29,61 @@ void *POSIX_Init( puts( "Init: pthread_condattr_init" ); status = pthread_condattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_condattr_init - EINVAL (attribute invalid)" ); status = pthread_condattr_init( NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_condattr_destroy" ); status = pthread_condattr_destroy( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_condattr_destroy - EINVAL (attribute invalid)" ); status = pthread_condattr_destroy( NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_condattr_init" ); status = pthread_condattr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_condattr_setpshared - PTHREAD_PROCESS_SHARED" ); status = pthread_condattr_setpshared( &attr, PTHREAD_PROCESS_SHARED ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_condattr_setpshared - PTHREAD_PROCESS_PRIVATE" ); status = pthread_condattr_setpshared( &attr, PTHREAD_PROCESS_PRIVATE ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_condattr_setpshared( NULL, PTHREAD_PROCESS_PRIVATE ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_condattr_setpshared - EINVAL (attribute invalid)" ); status = pthread_condattr_setpshared( &attr, 0x7FFF ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_condattr_setpshared - EINVAL (pshared invalid)" ); status = pthread_condattr_getpshared( &attr, &pshared ); - assert( !status ); + rtems_test_assert( !status ); printf( "Init: pthread_condattr_getpshared - %d\n", pshared ); status = pthread_condattr_getpshared( NULL, &pshared ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_condattr_getpshared - EINVAL (attribute invalid)" ); puts( "Init: pthread_cond_init - NULL attr" ); status = pthread_cond_init( &cond, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* error for attribute not initialized */ @@ -91,39 +91,39 @@ void *POSIX_Init( status = pthread_cond_init( &cond, &attr_error ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_cond_init - EINVAL (attr not initialized)" ); status = pthread_cond_init( &cond, NULL ); if ( status != ENOMEM ) printf( "status = %d\n", status ); - assert( status == ENOMEM ); + rtems_test_assert( status == ENOMEM ); puts( "Init: pthread_cond_init - ENOMEM (too many conds)" ); puts( "Init: pthread_cond_destroy" ); status = pthread_cond_destroy( &cond ); - assert( !status ); + rtems_test_assert( !status ); /* error for bad condition variable passed */ status = pthread_cond_destroy( NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_cond_destroy - EINVAL (cond invalid)" ); /* initiailize the attribute for the rest of the test */ puts( "Init: pthread_cond_init - attr" ); status = pthread_cond_init( &Cond1_id, &attr ); - assert( !status ); + rtems_test_assert( !status ); /* signal task1 with a condition variable */ empty_line(); status = pthread_create( &Task_id, NULL, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* switch to task1 to allow it to wait for a condition variable */ @@ -133,17 +133,17 @@ void *POSIX_Init( status = pthread_cond_destroy( &Cond1_id ); if ( status != EBUSY ) printf( "status = %d\n", status ); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); puts( "Init: pthread_cond_destroy - EBUSY (task1 waiting)" ); puts( "Init: pthread_cond_signal" ); status = pthread_cond_signal( &Cond1_id ); - assert( !status ); + rtems_test_assert( !status ); empty_line(); status = pthread_create( &Task2_id, NULL, Task_2, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* switch to task1 and task2 to allow them to wait for broadcast signal */ @@ -154,7 +154,7 @@ void *POSIX_Init( puts( "Init: pthread_cond_broadcast" ); status = pthread_cond_broadcast( &Cond1_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: sleep - switch to Task_1" ); sleep( 0 ); @@ -162,12 +162,12 @@ void *POSIX_Init( /* timedwait case - timeout */ status = pthread_mutex_lock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); /* set timeout to 3 seconds */ status = clock_gettime( CLOCK_REALTIME, &timeout ); - assert( !status ); + rtems_test_assert( !status ); timeout.tv_sec += 3; timeout.tv_nsec = 0; @@ -175,11 +175,11 @@ void *POSIX_Init( status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout ); if ( status != ETIMEDOUT ) printf( "status = %d\n", status ); - assert( status == ETIMEDOUT ); + rtems_test_assert( status == ETIMEDOUT ); puts( "Init: pthread_cond_timedwait - ETIMEDOUT - (mutex not acquired)" ); status = pthread_mutex_unlock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); /* remaining error messages */ @@ -190,78 +190,78 @@ void *POSIX_Init( status = pthread_cond_signal( NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_cond_signal - EINVAL (cond invalid)" ); status = pthread_cond_broadcast( NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_cond_broadcast - EINVAL (cond invalid)" ); /* acquire mutex so errors will occur */ status = pthread_mutex_lock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_cond_wait( NULL, &Mutex_id ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_cond_wait - EINVAL (cond invalid)" ); status = pthread_cond_timedwait( NULL, &Mutex_id, &timeout ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_cond_timedwait - EINVAL (cond invalid)" ); status = pthread_cond_wait( &Cond1_id, NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_cond_wait - EINVAL (mutex invalid)" ); status = pthread_cond_timedwait( &Cond1_id, NULL, &timeout ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_cond_timedwait - EINVAL (mutex invalid)" ); status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_cond_timedwait - EINVAL (abstime NULL)" ); status = clock_gettime( CLOCK_REALTIME, &timeout ); - assert( !status ); + rtems_test_assert( !status ); timeout.tv_sec -= 1; status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout ); if ( status != ETIMEDOUT ) printf( "status = %d\n", status ); - assert( status == ETIMEDOUT ); + rtems_test_assert( status == ETIMEDOUT ); puts( "Init: pthread_cond_timedwait - ETIMEDOUT (abstime->tv_sec < current time)" ); status = pthread_mutex_unlock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_mutex_lock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); /* ensure we do not catch a 0 nanosecond boundary */ do { status = clock_gettime( CLOCK_REALTIME, &timeout ); - assert( !status ); + rtems_test_assert( !status ); timeout.tv_nsec -= 1; } while ( timeout.tv_nsec < 0); status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout ); if ( status != ETIMEDOUT ) printf( "status = %d\n", status ); - assert( status == ETIMEDOUT ); + rtems_test_assert( status == ETIMEDOUT ); puts( "Init: pthread_cond_timedwait - ETIMEDOUT (abstime->tv_nsec < current time)" ); status = pthread_mutex_unlock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); /* wait and timedwait without mutex */ @@ -270,26 +270,26 @@ void *POSIX_Init( * status = pthread_cond_wait( &Cond1_id, &Mutex_id ); * if ( status != EINVAL ) * printf( "status = %d\n", status ); - * assert( status == EINVAL ); + * rtems_test_assert( status == EINVAL ); */ puts( "Init: pthread_cond_wait - EINVAL (mutex not locked before call)" ); /* XXX - this case is commented out in the code pending review * * status = clock_gettime( CLOCK_REALTIME, &timeout ); - * assert( !status ); + * rtems_test_assert( !status ); * timeout.tv_sec += 1; * status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout ); * if ( status != EINVAL ) * printf( "status = %d\n", status ); - * assert( status == EINVAL ); + * rtems_test_assert( status == EINVAL ); */ puts( "Init: pthread_cond_timedwait - EINVAL (mutex not locked before call)"); empty_line(); status = pthread_create( &Task3_id, NULL, Task_3, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* switch to task3 to allow it to wait for broadcast signal */ @@ -299,7 +299,7 @@ void *POSIX_Init( /* destroy the mutex so Task3 can not acguire at the end of Wait_support */ status = pthread_mutex_destroy( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); /* signal a condition variable to task3 */ diff --git a/testsuites/psxtests/psx10/task.c b/testsuites/psxtests/psx10/task.c index fb49b1544a..8e53bc4927 100644 --- a/testsuites/psxtests/psx10/task.c +++ b/testsuites/psxtests/psx10/task.c @@ -7,7 +7,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -31,31 +31,31 @@ void *Task_1( printf( "Task_1: ID is 0x%08" PRIxpthread_t "\n", Task_id ); status = pthread_mutex_init( &Mutex_id, NULL ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_mutex_lock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: pthread_cond_wait" ); status = pthread_cond_wait( &Cond1_id, &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: back from pthread_cond_wait release mutex" ); status = pthread_mutex_unlock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); /* wait for a condition variable broadcast from Init */ status = pthread_mutex_lock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: pthread_cond_wait" ); status = pthread_cond_wait( &Cond1_id, &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: back from pthread_cond_wait release mutex" ); status = pthread_mutex_unlock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: task exit" ); pthread_exit( NULL ); diff --git a/testsuites/psxtests/psx10/task2.c b/testsuites/psxtests/psx10/task2.c index 6aef292030..dcf1847945 100644 --- a/testsuites/psxtests/psx10/task2.c +++ b/testsuites/psxtests/psx10/task2.c @@ -7,7 +7,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -29,15 +29,15 @@ void *Task_2( printf( "Task_2: ID is 0x%08" PRIxpthread_t "\n", Task_id ); status = pthread_mutex_lock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_2: pthread_cond_wait" ); status = pthread_cond_wait( &Cond1_id, &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_2: back from pthread_cond_wait release mutex" ); status = pthread_mutex_unlock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_2: task exit" ); pthread_exit( NULL ); diff --git a/testsuites/psxtests/psx10/task3.c b/testsuites/psxtests/psx10/task3.c index fdf18fbe8f..f3493aeb16 100644 --- a/testsuites/psxtests/psx10/task3.c +++ b/testsuites/psxtests/psx10/task3.c @@ -7,7 +7,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -29,13 +29,13 @@ void *Task_3( printf( "Task_3: ID is 0x%08" PRIxpthread_t "\n", Task_id ); status = pthread_mutex_lock( &Mutex_id ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_3: pthread_cond_wait" ); status = pthread_cond_wait( &Cond1_id, &Mutex_id ); if ( status != EINVAL ) printf( "status = %d\n", status ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Task_3: pthread_cond_wait - EINVAL (mutex not locked after signal)"); puts( "Task_3: task exit" ); diff --git a/testsuites/psxtests/psx11/init.c b/testsuites/psxtests/psx11/init.c index 136647a27f..088dcff40f 100644 --- a/testsuites/psxtests/psx11/init.c +++ b/testsuites/psxtests/psx11/init.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-2008. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -52,7 +52,7 @@ void *POSIX_Init( priority_1 ); status = pthread_setschedparam( Init_id, SCHED_FIFO, ¶m ); - assert( !status ); + rtems_test_assert( !status ); param.sched_priority = priority_2; @@ -61,7 +61,7 @@ void *POSIX_Init( priority_2 ); status = pthread_setschedparam( Init_id, SCHED_RR, ¶m ); - assert( !status ); + rtems_test_assert( !status ); param.sched_priority = priority_3; @@ -70,59 +70,59 @@ void *POSIX_Init( priority_3 ); status = pthread_setschedparam( Init_id, SCHED_OTHER, ¶m ); - assert( !status ); + rtems_test_assert( !status ); /* create a thread as SCHED_FIFO */ printf( "Init: create a thread of SCHED_FIFO with priority %d\n", priority_4 ); status = pthread_attr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); attr.schedpolicy = SCHED_FIFO; attr.schedparam.sched_priority = priority_4; status = pthread_create( &Task_id, &attr, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: join with the other thread" ); status = pthread_join( Task_id, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* create a thread as SCHED_RR */ printf( "Init: create a thread of SCHED_RR with priority %d\n", priority_4 ); status = pthread_attr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); - assert( !status ); + rtems_test_assert( !status ); attr.schedpolicy = SCHED_RR; attr.schedparam.sched_priority = priority_4; status = pthread_create( &Task_id, &attr, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: join with the other thread" ); status = pthread_join( Task_id, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* create a thread as SCHED_OTHER */ printf( "Init: create a thread of SCHED_OTHER with priority %d\n", priority_4 ); status = pthread_attr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); attr.schedpolicy = SCHED_OTHER; attr.schedparam.sched_priority = priority_4; status = pthread_create( &Task_id, &attr, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: join with the other thread" ); status = pthread_join( Task_id, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "*** END OF POSIX TEST 11 ***" ); rtems_test_exit( 0 ); diff --git a/testsuites/psxtests/psx11/task.c b/testsuites/psxtests/psx11/task.c index ac35cc6c76..5dd8aa3924 100644 --- a/testsuites/psxtests/psx11/task.c +++ b/testsuites/psxtests/psx11/task.c @@ -50,10 +50,10 @@ void *Task_1( struct timespec delay; status = clock_gettime( CLOCK_REALTIME, &start ); - assert( !status ); + rtems_test_assert( !status ); status = sched_rr_get_interval( getpid(), &delay ); - assert( !status ); + rtems_test_assert( !status ); /* double the rr interval for confidence */ @@ -69,7 +69,7 @@ void *Task_1( for ( ; ; ) { status = clock_gettime( CLOCK_REALTIME, ¤t ); - assert( !status ); + rtems_test_assert( !status ); diff_timespec( &start, ¤t, &difference ); diff --git a/testsuites/psxtests/psx12/init.c b/testsuites/psxtests/psx12/init.c index 6000e83bc4..c5e6e62ffb 100644 --- a/testsuites/psxtests/psx12/init.c +++ b/testsuites/psxtests/psx12/init.c @@ -62,25 +62,25 @@ void *POSIX_Init( puts( "Init: pthread_attr_init - SUCCESSFUL" ); status = pthread_attr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); - assert( !status ); + rtems_test_assert( !status ); attr.schedpolicy = -1; puts( "Init: pthread_create - EINVAL (invalid scheduling policy)" ); status = pthread_create( &Task_id, &attr, Task_1, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* replenish period < budget error */ puts( "Init: pthread_attr_init - SUCCESSFUL" ); status = pthread_attr_init( &attr ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: set scheduling parameter attributes for sporadic server" ); status = pthread_attr_setschedpolicy( &attr, SCHED_SPORADIC ); - assert( !status ); + rtems_test_assert( !status ); schedparam.ss_replenish_period.tv_sec = 1; schedparam.ss_replenish_period.tv_nsec = 0; @@ -91,14 +91,14 @@ void *POSIX_Init( schedparam.ss_low_priority = 100; status = pthread_attr_setschedparam( &attr, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_create - EINVAL (replenish < budget)" ); status = pthread_create( &Task_id, &attr, Task_1, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* invalid ss_low_priority error */ @@ -111,11 +111,11 @@ void *POSIX_Init( schedparam.ss_low_priority = -1; status = pthread_attr_setschedparam( &attr, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_create - EINVAL (invalid ss_low_priority)" ); status = pthread_create( &Task_id, &attr, Task_1, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* create a thread as a sporadic server */ @@ -128,14 +128,14 @@ void *POSIX_Init( schedparam.ss_low_priority = sched_get_priority_max( SCHED_FIFO ) - 6; status = pthread_attr_setschedparam( &attr, &schedparam ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_create - SUCCESSFUL" ); status = pthread_create( &Task_id, &attr, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); status = pthread_join( Task_id, NULL ); - assert( status ); + rtems_test_assert( status ); /* switch to Task_1 */ diff --git a/testsuites/psxtests/psxalarm01/init.c b/testsuites/psxtests/psxalarm01/init.c index 3f316d9db6..ada5f73866 100644 --- a/testsuites/psxtests/psxalarm01/init.c +++ b/testsuites/psxtests/psxalarm01/init.c @@ -70,7 +70,7 @@ void *POSIX_Init( /* install a signal handler for SIGALRM and unblock it */ sc = sigemptyset( &act.sa_mask ); - assert( !sc ); + rtems_test_assert( !sc ); act.sa_handler = Signal_handler; act.sa_flags = 0; @@ -78,21 +78,21 @@ void *POSIX_Init( sigaction( SIGALRM, &act, NULL ); sc = sigemptyset( &mask ); - assert( !sc ); + rtems_test_assert( !sc ); sc = sigaddset( &mask, SIGALRM ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init: Unblock SIGALRM" ); sc = sigprocmask( SIG_UNBLOCK, &mask, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); /* schedule the alarm */ puts( "Init: Firing alarm in 1 second" ); remaining = alarm( 1 ); printf( "Init: %d seconds left on previous alarm\n", sc ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init: Wait for alarm" ); sleep( 2 ); @@ -100,7 +100,7 @@ void *POSIX_Init( puts( "Init: Cancel alarm" ); remaining = alarm( 0 ); printf( "Init: %d seconds left on previous alarm\n", remaining ); - assert( remaining == 0 ); + rtems_test_assert( remaining == 0 ); puts( "*** END OF POSIX ALARM TEST 01***" ); rtems_test_exit( 0 ); diff --git a/testsuites/psxtests/psxbarrier01/test.c b/testsuites/psxtests/psxbarrier01/test.c index b128c27484..b359cdf32d 100644 --- a/testsuites/psxtests/psxbarrier01/test.c +++ b/testsuites/psxtests/psxbarrier01/test.c @@ -11,7 +11,6 @@ * $Id$ */ -#include <assert.h> #include <stdio.h> #include <errno.h> #include <stdlib.h> @@ -34,7 +33,7 @@ void *BarrierThread(void *arg) printf( "pthread_barrier_wait( &Barrier ) for thread 0x%08" PRIxpthread_t "\n", id ); status = pthread_barrier_wait( &Barrier ); printf( "pthread_barrier_wait - 0x%08" PRIxpthread_t " released\n", id ); - assert( (status == 0) || (status == PTHREAD_BARRIER_SERIAL_THREAD) ); + rtems_test_assert( (status == 0) || (status == PTHREAD_BARRIER_SERIAL_THREAD) ); return NULL; } @@ -66,155 +65,155 @@ int main( /*************** NULL POINTER CHECKS *****************/ puts( "pthread_barrierattr_init( NULL ) -- EINVAL" ); status = pthread_barrierattr_init( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_setpshared( NULL, private ) -- EINVAL" ); status = pthread_barrierattr_setpshared( NULL, PTHREAD_PROCESS_PRIVATE ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_setpshared( NULL, shared ) -- EINVAL" ); status = pthread_barrierattr_setpshared( NULL, PTHREAD_PROCESS_SHARED ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_getpshared( NULL, &p ) -- EINVAL" ); status = pthread_barrierattr_getpshared( NULL, &p ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_destroy( NULL ) -- EINVAL" ); status = pthread_barrierattr_destroy( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** NOT INITIALIZED CHECKS *****************/ /* cheat visibility */ attr.is_initialized = 0; puts( "pthread_barrierattr_setpshared( &attr, shared ) -- EINVAL" ); status = pthread_barrierattr_setpshared( &attr, PTHREAD_PROCESS_SHARED ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_getpshared( &attr, NULL ) -- EINVAL" ); status = pthread_barrierattr_getpshared( &attr, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_destroy( &attr ) -- EINVAL" ); status = pthread_barrierattr_destroy( &attr ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** ACTUALLY WORK THIS TIME *****************/ puts( "pthread_barrierattr_init( &attr ) -- OK" ); status = pthread_barrierattr_init( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_setpshared( &attr, private ) -- OK" ); status = pthread_barrierattr_setpshared( &attr, PTHREAD_PROCESS_PRIVATE ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_getpshared( &attr, &p ) -- OK" ); status = pthread_barrierattr_getpshared( &attr, &p ); - assert( status == 0 ); - assert( p == PTHREAD_PROCESS_PRIVATE ); + rtems_test_assert( status == 0 ); + rtems_test_assert( p == PTHREAD_PROCESS_PRIVATE ); puts( "pthread_barrierattr_setpshared( &attr, shared ) -- OK" ); status = pthread_barrierattr_setpshared( &attr, PTHREAD_PROCESS_SHARED ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_getpshared( &attr, &p ) -- OK" ); status = pthread_barrierattr_getpshared( &attr, &p ); - assert( status == 0 ); - assert( p == PTHREAD_PROCESS_SHARED ); + rtems_test_assert( status == 0 ); + rtems_test_assert( p == PTHREAD_PROCESS_SHARED ); /*************** BAD PSHARED CHECK *****************/ puts( "pthread_barrierattr_setpshared( &attr, private ) -- EINVAL" ); status = pthread_barrierattr_setpshared( &attr, ~PTHREAD_PROCESS_PRIVATE ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** DESTROY/REUSE CHECK *****************/ puts( "pthread_barrierattr_destroy( &attr ) -- OK" ); status = pthread_barrierattr_destroy( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_getpshared( &attr, &p ) destroyed -- EINVAL" ); status = pthread_barrierattr_getpshared( &attr, &p ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** pthread_barrier_init ERROR CHECKs *********/ /* NULL barrier argument */ puts( "pthread_barrier_init( NULL, NULL, 2 ) -- EINVAL" ); status = pthread_barrier_init( NULL, NULL, 2 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* uninitialized attr argument */ puts( "pthread_barrier_init( &barrier, &attr, 2 ) -- EINVAL" ); status = pthread_barrier_init( &barrier, &attr, 2 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* zero count argument */ puts( "pthread_barrierattr_init( &attr ) -- OK" ); status = pthread_barrierattr_init( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrier_init( &barrier, &attr, 0 ) -- EINVAL" ); status = pthread_barrier_init( &barrier, &attr, 0 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* allocating too many */ puts( "pthread_barrier_init( &barrier, NULL, 1 ) -- OK" ); status = pthread_barrier_init( &barrier, NULL, 1 ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrier_init( &barrier, NULL, 1 ) -- EAGAIN" ); status = pthread_barrier_init( &barrier, NULL, 1 ); - assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); /* clean up */ puts( "pthread_barrier_destroy( &barrier ) -- OK" ); status = pthread_barrier_destroy( &barrier ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_destroy( &attr ) -- OK" ); status = pthread_barrierattr_destroy( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** pthread_barrier_destroy ERROR CHECKs *********/ /* NULL barrier argument */ puts( "pthread_barrier_destroy( NULL ) -- EINVAL" ); status = pthread_barrier_destroy( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrier_destroy( &bad_barrier ) -- EINVAL" ); status = pthread_barrier_destroy( &bad_barrier ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** pthread_barrier_wait ERROR CHECKs *********/ /* NULL barrier argument */ puts( "pthread_barrier_wait( NULL ) -- EINVAL" ); status = pthread_barrier_wait( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrier_wait( &bad_barrier ) -- EINVAL" ); status = pthread_barrier_wait( &bad_barrier ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** ACTUALLY CREATE ONE CHECK *****************/ puts( "pthread_barrierattr_init( &attr ) -- OK" ); status = pthread_barrierattr_init( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrier_init( &barrier, &attr, 2 ) -- OK" ); status = pthread_barrier_init( &barrier, &attr, 2 ); - assert( status == 0 ); - assert( barrier != 0 ); + rtems_test_assert( status == 0 ); + rtems_test_assert( barrier != 0 ); puts( "pthread_barrier_destroy( &barrier ) -- OK" ); status = pthread_barrier_destroy( &barrier ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** CREATE THREADS AND LET THEM RELEASE *****************/ puts( "pthread_barrier_init( &Barrier, &attr, NUMBER_THREADS ) -- OK" ); status = pthread_barrier_init( &Barrier, &attr, NUMBER_THREADS ); - assert( status == 0 ); - assert( barrier != 0 ); + rtems_test_assert( status == 0 ); + rtems_test_assert( barrier != 0 ); for (i=0 ; i<NUMBER_THREADS ; i++ ) { @@ -222,13 +221,13 @@ int main( if (i == NUMBER_THREADS - 1) { puts( "pthread_barrier_destroy( &Barrier ) -- EBUSY" ); status = pthread_barrier_destroy( &Barrier ); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); } /* create a thread to block on the barrier */ printf( "Init: pthread_create - thread %d OK\n", i+1 ); status = pthread_create(&ThreadIds[i], NULL, BarrierThread, &ThreadIds[i]); - assert( !status ); + rtems_test_assert( !status ); sleep(1); } diff --git a/testsuites/psxtests/psxcancel01/init.c b/testsuites/psxtests/psxcancel01/init.c index f09d127f8a..79d8bd25ef 100644 --- a/testsuites/psxtests/psxcancel01/init.c +++ b/testsuites/psxtests/psxcancel01/init.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -63,7 +63,7 @@ void doit( TSR_status = 0; status = rtems_timer_fire_after( timer_id, 10, TSR, NULL ); - assert( !status ); + rtems_test_assert( !status ); start = rtems_clock_get_ticks_since_boot(); do { @@ -94,7 +94,7 @@ void *POSIX_Init( rtems_build_name( 'T', 'M', '1', ' ' ), &timer_id ); - assert( !status ); + rtems_test_assert( !status ); doit( Cancel_duringISR_TSR, "pthread_cancel" ); doit( SetState_duringISR_TSR, "pthread_setcancelstate" ); diff --git a/testsuites/psxtests/psxchroot01/test.c b/testsuites/psxtests/psxchroot01/test.c index 19348508c3..61045f7ce6 100644 --- a/testsuites/psxtests/psxchroot01/test.c +++ b/testsuites/psxtests/psxchroot01/test.c @@ -15,7 +15,12 @@ * implementation of this appears to seek to the ((off/DIRENT_SIZE) + 1) * record where DIRENT_SIZE seems to be 12 bytes. * + * COPYRIGHT (c) 1989-2009. + * On-Line Applications Research Corporation (OAR). * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. * * $Id$ */ @@ -24,7 +29,6 @@ #include <sys/types.h> #include <fcntl.h> #include <string.h> -#include <assert.h> #include <unistd.h> #include <errno.h> #include <rtems/libio.h> @@ -35,10 +39,10 @@ void touch( char *file ) { int fd; - assert( file ); + rtems_test_assert( file ); fd = open( file, O_RDWR|O_CREAT, 0777 ); - assert( fd != -1 ); + rtems_test_assert( fd != -1 ); close( fd ); } @@ -47,7 +51,7 @@ int fileexists( char *file ) int status; struct stat statbuf; - assert( file ); + rtems_test_assert( file ); status = stat( file, &statbuf ); @@ -86,19 +90,19 @@ int main( printf( "\n\n*** CHROOT01 TEST ***\n" ); status = mkdir( "/one", 0777); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = mkdir( "/one/one", 0777); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = mkdir( "/one/two", 0777); - assert( status == 0 ); + rtems_test_assert( status == 0 ); touch( "/one/one.test" ); touch( "/one/two/two.test" ); status = chroot( "/one" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = fileexists( "/one/one.test" ); printf( "%s on /one/one.test\n", (!status) ? "SUCCESS" : "FAILURE" ); diff --git a/testsuites/psxtests/psxclock/init.c b/testsuites/psxtests/psxclock/init.c index 9f1e4615fc..f0440185dd 100644 --- a/testsuites/psxtests/psxclock/init.c +++ b/testsuites/psxtests/psxclock/init.c @@ -210,7 +210,7 @@ rtems_task Init( delay_request.tv_sec = 1; delay_request.tv_nsec = 35000000; sc = nanosleep( &delay_request, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); /* print the current real time again */ sc = clock_gettime( CLOCK_REALTIME, &tv ); diff --git a/testsuites/psxtests/psxfile01/test.c b/testsuites/psxtests/psxfile01/test.c index 45e1967f33..a9efab4c76 100644 --- a/testsuites/psxtests/psxfile01/test.c +++ b/testsuites/psxtests/psxfile01/test.c @@ -31,7 +31,6 @@ #include <string.h> #include <ctype.h> -#include <assert.h> #include <rtems.h> #include <rtems/libio.h> @@ -100,7 +99,7 @@ void stat_a_file( int status; struct stat statbuf; - assert( file ); + rtems_test_assert( file ); printf( "stat( %s ) returned ", file ); fflush( stdout ); @@ -169,7 +168,7 @@ int main( puts( "stat of /dev/console" ); status = stat( "/dev/console", &buf ); - assert( !status ); + rtems_test_assert( !status ); dump_statbuf( &buf ); @@ -180,47 +179,47 @@ int main( puts( "" ); puts( "mkdir /dev/tty" ); status = mkdir( "/dev/tty", S_IRWXU ); - assert( !status ); + rtems_test_assert( !status ); puts( "" ); puts( "mkdir /usr" ); status = mkdir( "/usr", S_IRWXU ); - assert( !status ); + rtems_test_assert( !status ); puts( "mkdir /etc" ); status = mkdir( "/etc", S_IRWXU ); - assert( !status ); + rtems_test_assert( !status ); puts( "mkdir /tmp" ); status = mkdir( "/tmp", S_IRWXU ); - assert( !status ); + rtems_test_assert( !status ); /* this tests the ".." path in path name evaluation */ puts( "mkdir /tmp/.." ); status = mkdir( "/tmp/..", S_IRWXU ); - assert( status == -1 ); - assert( errno == EEXIST ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EEXIST ); /* now check out trailing separators */ puts( "mkdir /tmp/" ); status = mkdir( "/tmp/", S_IRWXU ); - assert( status == -1 ); - assert( errno == EEXIST ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EEXIST ); /* try to make a directory under a non-existent subdirectory */ puts( "mkdir /j/j1" ); status = mkdir( "/j/j1", S_IRWXU ); - assert( status == -1 ); - assert( errno == ENOENT ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOENT ); /* this tests the ability to make a directory in the current one */ puts( "mkdir tmp" ); status = mkdir( "tmp", S_IRWXU ); - assert( status == -1 ); - assert( errno == EEXIST ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EEXIST ); /* test rtems_filesystem_evaluate_path by sending NULL path */ status = chdir( NULL ); - assert( status == -1 ); + rtems_test_assert( status == -1 ); /* * Now switch gears and exercise rmdir(). @@ -229,37 +228,37 @@ int main( puts( "" ); puts( "rmdir /usr" ); status = rmdir( "/usr" ); - assert( !status ); + rtems_test_assert( !status ); puts( "rmdir /dev" ); status = rmdir( "/dev" ); - assert( status == -1 ); - assert( errno == ENOTEMPTY); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOTEMPTY); puts( "rmdir /fred" ); status = rmdir ("/fred"); - assert (status == -1); - assert( errno == ENOENT ); + rtems_test_assert (status == -1); + rtems_test_assert( errno == ENOENT ); puts( "mknod /dev/test_console" ); status = mknod( "/dev/test_console", S_IFCHR, 0LL ); - assert( !status ); + rtems_test_assert( !status ); puts( "mknod /dev/tty/S3" ); status = mknod( "/dev/tty/S3", S_IFCHR, 0xFF00000080LL ); - assert( !status ); + rtems_test_assert( !status ); puts ("mknod /etc/passwd"); status = mknod( "/etc/passwd", (S_IFREG | S_IRWXU), 0LL ); - assert( !status ); + rtems_test_assert( !status ); puts( "mkdir /tmp/my_dir"); status = mkdir( "/tmp/my_dir", S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts("mkfifo /c/my_dir" ); status = mkfifo( "/c/my_dir", S_IRWXU ); - assert( status == -1 ); + rtems_test_assert( status == -1 ); /* * Try to make a directory under a file -- ERROR @@ -267,8 +266,8 @@ int main( puts( "mkdir /etc/passwd/j" ); status = mkdir( "/etc/passwd/j", S_IRWXU ); - assert( status == -1 ); - assert( errno == ENOTDIR ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOTDIR ); /* * Simple open failure case on non-existent file @@ -276,8 +275,8 @@ int main( puts( "open /tmp/joel - should fail with ENOENT" ); fd = open( "/tmp/joel", O_RDONLY ); - assert( fd == -1 ); - assert( errno == ENOENT ); + rtems_test_assert( fd == -1 ); + rtems_test_assert( errno == ENOENT ); /* * Simple open case where the file is created. @@ -285,24 +284,24 @@ int main( puts( "open /tmp/j" ); fd = open( "/tmp/j", O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO ); - assert( fd != -1 ); + rtems_test_assert( fd != -1 ); printf( "open returned file descriptor %d\n", fd ); puts( "close /tmp/j" ); status = close( fd ); - assert( !status ); + rtems_test_assert( !status ); puts( "close /tmp/j again" ); status = close( fd ); - assert( status == -1 ); + rtems_test_assert( status == -1 ); puts( "unlink /tmp/j" ); status = unlink( "/tmp/j" ); - assert( !status ); + rtems_test_assert( !status ); puts( "unlink /tmp" ); status = unlink( "/tmp" ); - assert( status ); + rtems_test_assert( status ); /* * Simple open failure. Trying to create an existing file. @@ -310,22 +309,22 @@ int main( puts("create and close /tmp/tom"); fd = open( "/tmp/tom", O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO ); - assert( fd != -1 ); + rtems_test_assert( fd != -1 ); status = close( fd ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts("Attempt to recreate /tmp/tom"); fd = open( "/tmp/tom", O_CREAT | O_EXCL, S_IRWXU|S_IRWXG|S_IRWXO ); - assert( fd == -1 ); - assert( errno == EEXIST ); + rtems_test_assert( fd == -1 ); + rtems_test_assert( errno == EEXIST ); puts("create /tmp/john"); fd = open( "/tmp/john", O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO ); - assert( fd != -1 ); + rtems_test_assert( fd != -1 ); puts("tcdrain /tmp/john" ); status = tcdrain( fd ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Test simple write to a file at offset 0 @@ -341,10 +340,10 @@ int main( */ status = unlink( "/tmp/joel" ); - assert( !status ); + rtems_test_assert( !status ); status = mknod( "/tmp/joel", (S_IFREG | S_IRWXU), 0LL ); - assert( !status ); + rtems_test_assert( !status ); test_write( "/tmp/joel", 10, "the first write!!!\n" ); test_cat( "/tmp/joel", 0, 0 ); @@ -357,17 +356,17 @@ int main( puts("unlink /tmp/joel"); status = unlink( "/tmp/joel" ); - assert( !status ); + rtems_test_assert( !status ); /* Test a failure path */ puts( "unlink /tmp/joel" ); status = unlink( "/tmp/joel" ); - assert( status == -1 ); + rtems_test_assert( status == -1 ); puts( "mknod /tmp/joel"); status = mknod( "/tmp/joel", (S_IFREG | S_IRWXU), 0LL ); - assert( !status ); + rtems_test_assert( !status ); test_write( "/tmp/joel", 514, "the first write!!!\n" ); test_write( "/tmp/joel", 1, test_write_buffer ); @@ -410,19 +409,19 @@ int main( puts( "fopen of /tmp/j" ); file = fopen( "/tmp/j", "w+" ); - assert( file ); + rtems_test_assert( file ); puts( "fprintf to /tmp/j" ); for (i=1 ; i<=5 ; i++) { status = fprintf( file, "This is call %d to fprintf\n", i ); - assert( status ); + rtems_test_assert( status ); printf( "(%d) %d characters written to the file\n", i, status ); } fflush( file ); status = stat( "/tmp/j", &buf ); - assert( !status ); + rtems_test_assert( !status ); dump_statbuf( &buf ); atime2 = buf.st_atime; mtime2 = buf.st_mtime; @@ -438,14 +437,14 @@ int main( * Verify only atime changed for a read. */ status = stat( "/tmp/j", &buf ); - assert( !status ); + rtems_test_assert( !status ); dump_statbuf( &buf ); atime1 = buf.st_atime; mtime1 = buf.st_mtime; ctime1 = buf.st_ctime; - assert( atime1 != atime2); - assert( mtime1 == mtime2); - assert( ctime1 == ctime2); + rtems_test_assert( atime1 != atime2); + rtems_test_assert( mtime1 == mtime2); + rtems_test_assert( ctime1 == ctime2); IMFS_dump(); @@ -458,41 +457,41 @@ int main( status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() ); puts( "truncate /tmp/j to length of 40" ); status = truncate( "/tmp/j", 40 ); - assert( !status ); + rtems_test_assert( !status ); /* * Verify truncate changed only atime. */ status = stat( "/tmp/j", &buf ); - assert( !status ); + rtems_test_assert( !status ); dump_statbuf( &buf ); atime2 = buf.st_atime; mtime2 = buf.st_mtime; ctime2 = buf.st_ctime; - assert( atime1 != atime2); - assert( mtime1 == mtime2); - assert( ctime1 == ctime2); + rtems_test_assert( atime1 != atime2); + rtems_test_assert( mtime1 == mtime2); + rtems_test_assert( ctime1 == ctime2); IMFS_dump(); /* try to truncate the console and see what happens */ status = truncate( "/dev/console", 40 ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "truncate /tmp/j to length of 0" ); status = truncate( "/tmp/j", 0 ); - assert( !status ); + rtems_test_assert( !status ); puts( "truncate /tmp to length of 0 should fail with EISDIR\n"); status = truncate( "/tmp", 0 ); - assert( status == -1 ); + rtems_test_assert( status == -1 ); printf( "%d: %s\n", errno, strerror( errno ) ); - assert( errno == EISDIR ); + rtems_test_assert( errno == EISDIR ); IMFS_dump(); status = truncate( "/tmp/fred", 10 ); - assert( status == -1); + rtems_test_assert( status == -1); rtems_status = rtems_io_register_name( "/dev/console", 0, 0 ); diff --git a/testsuites/psxtests/psxfile01/test_cat.c b/testsuites/psxtests/psxfile01/test_cat.c index 0dfcd3975b..38eaf3ac88 100644 --- a/testsuites/psxtests/psxfile01/test_cat.c +++ b/testsuites/psxtests/psxfile01/test_cat.c @@ -2,6 +2,14 @@ * A test support function which performs a crude version of * "cat" so you can look at specific parts of a file. * + * COPYRIGHT (c) 1989-2009. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * * $Id$ */ @@ -15,8 +23,6 @@ #include <string.h> #include <ctype.h> -#include <assert.h> - #include <pmacros.h> /* @@ -41,7 +47,7 @@ void test_cat( off_t offset = (off_t)offset_arg; my_length = (length) ? length : sizeof( test_cat_buffer ); - assert( my_length <= sizeof( test_cat_buffer ) ); + rtems_test_assert( my_length <= sizeof( test_cat_buffer ) ); fd = open( file, O_RDONLY ); if ( fd == -1 ) { @@ -51,7 +57,7 @@ void test_cat( for ( ;; ) { status = lseek( fd, offset, SEEK_SET ); - assert( status != -1 ); + rtems_test_assert( status != -1 ); status = read( fd, test_cat_buffer, sizeof(test_cat_buffer) ); if ( status <= 0 ) { @@ -79,5 +85,5 @@ void test_cat( } status = close( fd ); - assert( !status ); + rtems_test_assert( !status ); } diff --git a/testsuites/psxtests/psxfile01/test_extend.c b/testsuites/psxtests/psxfile01/test_extend.c index bbc5b7b5d7..2de748d238 100644 --- a/testsuites/psxtests/psxfile01/test_extend.c +++ b/testsuites/psxtests/psxfile01/test_extend.c @@ -6,6 +6,13 @@ * The defined behavior is a seek() followed by a write() extends the file * and zero fills the new length part. * + * COPYRIGHT (c) 1989-2009. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * * $Id$ */ @@ -19,8 +26,6 @@ #include <string.h> #include <ctype.h> -#include <assert.h> - #include <pmacros.h> /* @@ -43,7 +48,7 @@ void test_extend( } status = lseek( fd, offset - 1, SEEK_SET ); - assert( status != -1 ); + rtems_test_assert( status != -1 ); status = write( fd, &c, 1 ); if ( status == -1 ) { @@ -58,5 +63,5 @@ void test_extend( } status = close( fd ); - assert( !status ); + rtems_test_assert( !status ); } diff --git a/testsuites/psxtests/psxfile01/test_write.c b/testsuites/psxtests/psxfile01/test_write.c index b87ba06624..ed33962d01 100644 --- a/testsuites/psxtests/psxfile01/test_write.c +++ b/testsuites/psxtests/psxfile01/test_write.c @@ -2,6 +2,13 @@ * A test support function which performs a write() and * handles implied open(), lseek(), write(), and close() operations. * + * COPYRIGHT (c) 1989-2009. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * * $Id$ */ @@ -14,8 +21,6 @@ #include <errno.h> #include <string.h> -#include <assert.h> - #include <pmacros.h> /* @@ -42,7 +47,7 @@ void test_write( } status = lseek( fd, offset, SEEK_SET ); - assert( status != -1 ); + rtems_test_assert( status != -1 ); status = write( fd, buffer, length ); if ( status == -1 ) { @@ -57,5 +62,5 @@ void test_write( } status = close( fd ); - assert( !status ); + rtems_test_assert( !status ); } diff --git a/testsuites/psxtests/psxitimer/init.c b/testsuites/psxtests/psxitimer/init.c index 317a182e36..d7c6b27ff4 100644 --- a/testsuites/psxtests/psxitimer/init.c +++ b/testsuites/psxtests/psxitimer/init.c @@ -26,48 +26,48 @@ void *POSIX_Init( /* test getitimer stub */ puts( "getitimer -- bad which - EINVAL " ); status = getitimer( 1234, &itimer ); - assert( status == -1 && errno == EINVAL ); + rtems_test_assert( status == -1 && errno == EINVAL ); puts( "getitimer -- NULL pointer - EFAULT " ); status = getitimer( ITIMER_REAL, NULL ); - assert( status == -1 && errno == EFAULT ); + rtems_test_assert( status == -1 && errno == EFAULT ); puts( "getitimer -- ITIMER_REAL - ENOSYS " ); status = getitimer( ITIMER_REAL, &itimer ); - assert( status == -1 && errno == ENOSYS ); + rtems_test_assert( status == -1 && errno == ENOSYS ); puts( "getitimer -- ITIMER_VIRTUAL - ENOSYS " ); status = getitimer( ITIMER_VIRTUAL, &itimer ); - assert( status == -1 && errno == ENOSYS ); + rtems_test_assert( status == -1 && errno == ENOSYS ); puts( "getitimer -- ITIMER_PROF - ENOSYS " ); status = getitimer( ITIMER_PROF, &itimer ); - assert( status == -1 && errno == ENOSYS ); + rtems_test_assert( status == -1 && errno == ENOSYS ); /* test setitimer stub */ puts( "setitimer -- bad which - EINVAL " ); status = setitimer( 1234, &itimer, &otimer ); - assert( status == -1 && errno == EINVAL ); + rtems_test_assert( status == -1 && errno == EINVAL ); puts( "setitimer -- NULL value pointer - EFAULT " ); status = setitimer( ITIMER_REAL, NULL, &otimer ); - assert( status == -1 && errno == EFAULT ); + rtems_test_assert( status == -1 && errno == EFAULT ); puts( "setitimer -- NULL value pointer - EFAULT " ); status = setitimer( ITIMER_REAL, &itimer, NULL ); - assert( status == -1 && errno == EFAULT ); + rtems_test_assert( status == -1 && errno == EFAULT ); puts( "setitimer -- ITIMER_REAL - ENOSYS " ); status = setitimer( ITIMER_REAL, &itimer, &otimer ); - assert( status == -1 && errno == ENOSYS ); + rtems_test_assert( status == -1 && errno == ENOSYS ); puts( "setitimer -- ITIMER_VIRTUAL - ENOSYS " ); status = setitimer( ITIMER_VIRTUAL, &itimer, &otimer ); - assert( status == -1 && errno == ENOSYS ); + rtems_test_assert( status == -1 && errno == ENOSYS ); puts( "setitimer -- ITIMER_PROF - ENOSYS " ); status = setitimer( ITIMER_PROF, &itimer, &otimer ); - assert( status == -1 && errno == ENOSYS ); + rtems_test_assert( status == -1 && errno == ENOSYS ); puts( "*** END OF POSIX TEST ITIMER ***" ); rtems_test_exit(0); diff --git a/testsuites/psxtests/psxkey01/task.c b/testsuites/psxtests/psxkey01/task.c index 9a81ec85a5..4d09677842 100644 --- a/testsuites/psxtests/psxkey01/task.c +++ b/testsuites/psxtests/psxkey01/task.c @@ -8,7 +8,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -34,14 +34,14 @@ void *Task_1( status = pthread_setspecific( Key_id[0], (void *)&Data_array[ 1 ] ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); key_data = pthread_getspecific( Key_id[0] ); printf( "Task_1: Got the key value of %ld\n", (unsigned long) ((uint32_t *)key_data - Data_array) ); if ( status ) printf( "status = %d\n", status ); - assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: exitting" ); pthread_exit( NULL ); diff --git a/testsuites/psxtests/psxkey02/init.c b/testsuites/psxtests/psxkey02/init.c index 246e1d18f2..df975a0ffd 100644 --- a/testsuites/psxtests/psxkey02/init.c +++ b/testsuites/psxtests/psxkey02/init.c @@ -30,13 +30,13 @@ void *POSIX_Init( puts( "Init - rtems_workspace_get_information - OK" ); sb = rtems_workspace_get_information( &start ); - assert( sb ); + rtems_test_assert( sb ); #if 0 printf( "Init - workspace free = %d\n", start.Free.largest ); printf( "Init - workspace free blocks = %d\n", start.Free.number ); #endif - assert( start.Free.number == 1 ); + rtems_test_assert( start.Free.number == 1 ); to_alloc = start.Free.largest; /* find the largest we can actually allocate */ @@ -57,15 +57,15 @@ void *POSIX_Init( * Verify heap is still in same shape if we couldn't allocate a task */ sb = rtems_workspace_get_information( &info ); - assert( sb ); - assert( info.Free.largest == start.Free.largest ); - assert( info.Free.number == start.Free.number ); + rtems_test_assert( sb ); + rtems_test_assert( info.Free.largest == start.Free.largest ); + rtems_test_assert( info.Free.number == start.Free.number ); puts( "Init - pthread_key_create - ENOMEM" ); while (1) { sb = rtems_workspace_allocate( to_alloc, &alloced ); - assert( sb ); + rtems_test_assert( sb ); sc = pthread_key_create( &key, NULL ); @@ -88,9 +88,9 @@ void *POSIX_Init( printf( "Init - workspace free/blocks = %d/%d\n", info.Free.largest, info.Free.number ); #endif - assert( sb ); - assert( info.Free.largest == start.Free.largest ); - assert( info.Free.number == start.Free.number ); + rtems_test_assert( sb ); + rtems_test_assert( info.Free.largest == start.Free.largest ); + rtems_test_assert( info.Free.number == start.Free.number ); to_alloc -= 8; if ( to_alloc == 0 ) @@ -105,7 +105,7 @@ void *POSIX_Init( */ puts( "Init - pthread_key_delete - OK" ); sc = pthread_key_delete( key ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); puts( "Init - verify workspace has same memory" ); sb = rtems_workspace_get_information( &info ); @@ -113,9 +113,9 @@ void *POSIX_Init( printf( "Init - workspace free/blocks = %d/%d\n", info.Free.largest, info.Free.number ); #endif - assert( sb ); - assert( info.Free.largest == start.Free.largest ); - assert( info.Free.number == start.Free.number ); + rtems_test_assert( sb ); + rtems_test_assert( info.Free.largest == start.Free.largest ); + rtems_test_assert( info.Free.number == start.Free.number ); puts( "*** END OF TEST KEY 02 ***" ); rtems_test_exit(0); diff --git a/testsuites/psxtests/psxkey03/init.c b/testsuites/psxtests/psxkey03/init.c index d69059072e..d551a444c2 100644 --- a/testsuites/psxtests/psxkey03/init.c +++ b/testsuites/psxtests/psxkey03/init.c @@ -30,7 +30,7 @@ void *Test_Thread( puts( "Test_Thread - pthread_setspecific - OK" ); sc = pthread_setspecific( Key, key_value ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Test_Thread - pthread_exit to run key destructors - OK" ); return NULL; @@ -51,21 +51,21 @@ void *POSIX_Init( */ puts( "Init - pthread_key_create with NULL destructor - OK" ); sc = pthread_key_create( &Key, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - pthread_create - OK" ); sc = pthread_create( &thread, NULL, Test_Thread, &sc ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - sleep - let thread run - 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 - pthread_key_delete - OK" ); sc = pthread_key_delete( Key ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); /* * Key with non-NULL destructor @@ -73,22 +73,22 @@ void *POSIX_Init( destructor_ran = false; puts( "Init - pthread_key_create with non-NULL destructor - OK" ); sc = pthread_key_create( &Key, destructor ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - pthread_create - OK" ); sc = pthread_create( &thread, NULL, Test_Thread, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - sleep - let thread run - OK" ); sc = nanosleep( &delay_request, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - verify destructor did NOT ran" ); - assert( destructor_ran == false ); + rtems_test_assert( destructor_ran == false ); puts( "Init - pthread_key_delete - OK" ); sc = pthread_key_delete( Key ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); puts( "*** END OF TEST KEY 03 ***" ); rtems_test_exit(0); diff --git a/testsuites/psxtests/psxmount/test.c b/testsuites/psxtests/psxmount/test.c index 43a3e609b0..49be3ecb26 100644 --- a/testsuites/psxtests/psxmount/test.c +++ b/testsuites/psxtests/psxmount/test.c @@ -15,17 +15,22 @@ * implementation of this appears to seek to the ((off/DIRENT_SIZE) + 1) * record where DIRENT_SIZE seems to be 12 bytes. * + * COPYRIGHT (c) 1989-2009. + * On-Line Applications Research Corporation (OAR). * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. * * $Id$ */ + #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <dirent.h> #include <string.h> -#include <assert.h> #include <unistd.h> #include <errno.h> #include <rtems.h> @@ -127,23 +132,23 @@ int main( printf("create /b/my_file\n"); fd = open ("/b/my_file", O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); - assert( fd != 0 ); + rtems_test_assert( fd != 0 ); close (fd); printf("Verify /b/my_file\n"); fd = open("/b/my_file", S_IRWXU|S_IRWXG|S_IRWXO); - assert( fd != 0 ); + rtems_test_assert( fd != 0 ); close( fd ); printf("create c/y/my_mount_point/my_dir/d\n"); fd = open ("c/y/my_mount_point/my_dir/d", O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); - assert( fd != 0 ); + rtems_test_assert( fd != 0 ); close (fd); printf("Verify c/y/my_mount_point/my_dir/d\n"); fd = open("c/y/my_mount_point/my_dir/d", S_IRWXU|S_IRWXG|S_IRWXO); - assert( fd != 0 ); + rtems_test_assert( fd != 0 ); close( fd ); /* @@ -157,7 +162,7 @@ int main( RTEMS_FILESYSTEM_READ_WRITE, NULL, mount_point_string ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); if( mt_entry == NULL ){ printf(" NULL mount table entry was returned\n"); } @@ -218,8 +223,8 @@ int main( RTEMS_FILESYSTEM_READ_WRITE, NULL, mount_point_string ); - assert( status == -1 ); - assert( errno == EINVAL ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EINVAL ); /* * Verify mount with option of -62 fails with EINVAL @@ -232,8 +237,8 @@ int main( -62, NULL, "/c/y/my_mount_point" ); - assert( status == -1 ); - assert( errno == EINVAL ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EINVAL ); /* * Mount a Read Only File system. @@ -246,7 +251,7 @@ int main( RTEMS_FILESYSTEM_READ_ONLY, NULL, "/c/y/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); if( mt_entry == NULL ){ printf(" NULL mount table entry was returned\n"); } @@ -260,11 +265,11 @@ int main( printf("create c/y/my_mount_point/../../y/my_mount_point/new_dir\n"); status = mkdir("c/y/my_mount_point/../../y/my_mount_point/new_dir",S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = stat("c/y/my_mount_point/../../y/my_mount_point/new_dir",&statbuf ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = stat("c/y/my_mount_point/new_dir/..", &statbuf ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Attempt to mount a second file system at a used mount point. @@ -277,8 +282,8 @@ int main( RTEMS_FILESYSTEM_READ_ONLY, NULL, "/c/y/my_mount_point" ); - assert( status == -1 ); - assert( errno == EBUSY); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EBUSY); /* * Attempt to mount at a file. @@ -291,8 +296,8 @@ int main( RTEMS_FILESYSTEM_READ_ONLY, NULL, "/b/my_file" ); - assert( status == -1 ); - assert( errno == ENOTDIR ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOTDIR ); /* @@ -301,15 +306,15 @@ int main( printf("Create and chdir to /c/y/my_mount_point/mydir\n"); status = mkdir( "/c/y/my_mount_point/mydir", 0777); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = chdir( "/c/y/my_mount_point/mydir" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("unmount of /c/y/my_mount_point should fail with EBUSY\n"); status = unmount( "/c/y/my_mount_point" ); - assert( status == -1 ); - assert( errno == EBUSY ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EBUSY ); /* * Chdir to root and verify we can unmount the file system now. @@ -317,11 +322,11 @@ int main( printf("chdir to / and verify we can unmount /c/y/my_mount_point\n"); status = chdir( "/" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("unmount /c/y/my_mount_point \n"); status = unmount( "/c/y/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Attempt to unmount a directory that does not exist. @@ -329,8 +334,8 @@ int main( printf("unmount /b/mount_point should fail with EINVAL\n"); status = unmount( "/b/mount_point" ); - assert( status == -1 ); - assert( errno == ENOENT ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOENT ); /* * Remount the filesystem. @@ -343,7 +348,7 @@ int main( RTEMS_FILESYSTEM_READ_ONLY, NULL, "/c/y/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Create a file and directory then open the directory. @@ -352,24 +357,24 @@ int main( printf("Create and open /c/y/my_mount_point/my_file\n"); fd = open( "/c/y/my_mount_point/my_file", O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); - assert( fd != -1 ); + rtems_test_assert( fd != -1 ); status = close( fd ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("\nmkdir /c/y/my_mount_point/my_dir\n"); status = mkdir( "/c/y/my_mount_point/my_dir", 0x1c0 ); printf("Open /c/y/my_mount_point/my_dir\n"); directory = opendir( "/c/y/my_mount_point/my_dir" ); - assert( directory ); + rtems_test_assert( directory ); printf("Unmount /c/y/my_mount_point should fail with EBUSY\n"); status = unmount( "/c/y/my_mount_point" ); - assert( status == -1 ); - assert( errno == EBUSY ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EBUSY ); printf("Close /c/y/my_mount_point/my_dir\n"); status = closedir( directory ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Attempt to unmount a directory that is not a mount point. @@ -377,8 +382,8 @@ int main( printf("Unmount /c/y/my_mount_point/my_dir should fail with EACCES\n"); status = unmount( "/c/y/my_mount_point/my_dir" ); - assert( status == -1 ); - assert( errno == EACCES ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EACCES ); /* * Verify a file system can not be unmounted with a mounted file system @@ -392,12 +397,12 @@ int main( RTEMS_FILESYSTEM_READ_WRITE, NULL, "/c/y/my_mount_point/my_dir"); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("unmount /c/y/my_mount_point should fail with EBUSY\n"); status = unmount( "/c/y/my_mount_point" ); - assert( status == -1 ); - assert( errno == EBUSY ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EBUSY ); /* * Verify you cannot create a hard link across mounted file systems. @@ -405,11 +410,11 @@ int main( printf("Verify a hard link across filesystems fails with EXDEV\n"); status = mkdir( "/c/y/my_mount_point/my_dir2", S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = link( "/c/y/my_mount_point/my_dir2", "/c/y/my_mount_point/my_dir/my_link" ); - assert( status == -1 ); - assert( errno == EXDEV ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EXDEV ); /* * Create a symbolic link across mountpoints. @@ -417,13 +422,13 @@ int main( printf("Verify a symbolic link across file systems works\n"); status = symlink( "/c/y/my_mount_point/my_dir2", "/c/y/my_mount_point/my_dir/my_link" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = stat( "/c/y/my_mount_point/my_dir/my_link", &statbuf ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("unmount /c/y/my_mount_point/my_dir\n"); status = unmount( "/c/y/my_mount_point/my_dir" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Verify symblic link no longer works. @@ -431,11 +436,11 @@ int main( printf("Verify the symbolic link now fails\n"); status = stat( "/c/y/my_mount_point/my_dir/my_link", &statbuf ); - assert( status != 0 ); + rtems_test_assert( status != 0 ); printf("unmount /c/y/my_mount_point\n"); status = unmount( "/c/y/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf( "\n\n*** END OF MOUNT/UNMOUNT TEST ***\n" ); rtems_test_exit(0); diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c index bc4ae8dfc0..8bd1abb14b 100644 --- a/testsuites/psxtests/psxmsgq01/init.c +++ b/testsuites/psxtests/psxmsgq01/init.c @@ -130,7 +130,7 @@ void open_test_queues(void) else Test_q[que].mq = mq_open( tq->name, tq->oflag, 0x777, &attr ); - assert( Test_q[que].mq != (-1) ); + rtems_test_assert( Test_q[que].mq != (-1) ); } status = mq_close( Test_q[NUMBER_OF_TEST_QUEUES].mq ); @@ -223,7 +223,7 @@ void validate_mq_open_error_codes(void) puts( "Init: mq_open - Create an Existing mq (EEXIST)" ); open_mq[0] = mq_open( Build_Queue_Name(0), O_CREAT | O_RDWR | O_NONBLOCK, 0x777, NULL ); - assert( open_mq[0] != (-1) ); + rtems_test_assert( open_mq[0] != (-1) ); n_mq2 = mq_open( Build_Queue_Name(0), O_CREAT | O_EXCL | O_RDONLY, 0x777, NULL); @@ -245,8 +245,8 @@ void validate_mq_open_error_codes(void) for (i = 0; i < CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES; i++) { open_mq[i] = mq_open( Build_Queue_Name(i), O_CREAT | O_RDWR | O_NONBLOCK, 0x777, NULL ); - assert( open_mq[i] != (-1) ); - assert( open_mq[i] ); + rtems_test_assert( open_mq[i] != (-1) ); + rtems_test_assert( open_mq[i] ); /*XXX - Isn't there a more general check */ /* JRS printf( "mq_open 0x%x %s\n", open_mq[i], Build_Queue_Name(i) ); */ } @@ -494,7 +494,7 @@ void Read_msg_from_que( sprintf( err_msg, "%s msg %s size failure", Test_q[ que ].name, ptr->msg ); fatal_int_service_status( status, ptr->size, err_msg ); - assert( !strcmp( message, ptr->msg ) ); + rtems_test_assert( !strcmp( message, ptr->msg ) ); strcpy( message, "No Message" ); sprintf( err_msg,"%s msg %s size failure", Test_q[ que ].name, ptr->msg ); @@ -683,7 +683,7 @@ void verify_open_functionality(void) puts( "Init: mq_open - Open an existing mq ( same id )" ); n_mq = mq_open( RD_NAME, 0 ); fatal_posix_service_status( - assert( n_mq == Test_q[RD_QUEUE].mq ); + rtems_test_assert( n_mq == Test_q[RD_QUEUE].mq ); #endif } @@ -704,8 +704,8 @@ void verify_unlink_functionality(void) fatal_posix_service_status( status, 0, "mq_unlink locked message queue"); n_mq = mq_open( DEFAULT_NAME, DEFAULT_ATTR, 0x777, NULL ); - assert( n_mq != (-1) ); - assert( n_mq != Test_q[ DEFAULT_RW ].mq ); + rtems_test_assert( n_mq != (-1) ); + rtems_test_assert( n_mq != Test_q[ DEFAULT_RW ].mq ); status = mq_unlink( DEFAULT_NAME ); @@ -888,10 +888,10 @@ void wait_for_signal( timeout.tv_nsec = 0; status = sigemptyset( waitset ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( waitset, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); printf( "waiting on any signal for %d seconds.\n", sec ); signo = sigtimedwait( waitset, &siginfo, &timeout ); @@ -1007,7 +1007,7 @@ void verify_with_threads(void) Start_Test( "multi-thread Task 4 Receive Test" ); status = pthread_create( &id, NULL, Task_4, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: mq_receive - Empty queue changes to non-blocking (EAGAIN)" ); status = mq_receive( Test_q[BLOCKING].mq, message, 100, &priority ); fatal_int_service_status( status, -1, "mq_receive error return status"); @@ -1022,7 +1022,7 @@ void verify_with_threads(void) Start_Test( "multi-thread Task 1 Test" ); status = pthread_create( &id, NULL, Task_1, NULL ); - assert( !status ); + rtems_test_assert( !status ); Read_msg_from_que( BLOCKING, 0 ); /* Block until init writes */ print_current_time( "Init: ", "" ); @@ -1036,7 +1036,7 @@ void verify_with_threads(void) Start_Test( "multi-thread Task 4 Send Test" ); fill_message_queues( "Init:" ); status = pthread_create( &id, NULL, Task_4, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: mq_send - Full queue changes to non-blocking (EAGAIN)" ); status = mq_send(Test_q[BLOCKING].mq, message, 0, 0 ); fatal_posix_service_status( status, -1, "mq_send error return status"); @@ -1051,7 +1051,7 @@ void verify_with_threads(void) Start_Test( "multi-thread Task 2 Test" ); fill_message_queues( "Init:" ); status = pthread_create( &id, NULL, Task_2, NULL ); - assert( !status ); + rtems_test_assert( !status ); Show_send_msg_to_que( "Init:", BLOCKING, Priority_Order[0] ); print_current_time( "Init: ", "" ); verify_queues_full( "Init:" ); @@ -1065,7 +1065,7 @@ void verify_with_threads(void) Start_Test( "multi-thread Task 3 Test" ); fill_message_queues( "Init:" ); status = pthread_create( &id, NULL, Task_3, NULL ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: mq_send - Block while thread deletes queue (EBADF)" ); ptr = &Predefined_Msgs[0]; status = mq_send( Test_q[BLOCKING].mq, ptr->msg, ptr->size , ptr->priority ); @@ -1271,7 +1271,7 @@ void *Task_1 ( /* switch to Init */ - assert( 0 ); + rtems_test_assert( 0 ); return NULL; /* just so the compiler thinks we returned something */ } diff --git a/testsuites/psxtests/psxmsgq03/init.c b/testsuites/psxtests/psxmsgq03/init.c index 2c941da090..4d64aa53d5 100644 --- a/testsuites/psxtests/psxmsgq03/init.c +++ b/testsuites/psxtests/psxmsgq03/init.c @@ -55,14 +55,14 @@ void *POSIX_Init( if ( Queue == (-1) ) { perror( "mq_open failed" ); } - assert( Queue != (-1) ); + rtems_test_assert( Queue != (-1) ); puts( "Init - send to message queue" ); status = mq_send( Queue, (const char *)&status, sizeof(int), 1 ); if ( status == (-1) ) { perror( "mq_status failed" ); } - assert( status != (-1) ); + rtems_test_assert( status != (-1) ); /* * Now create the timer we will send to a full queue from. diff --git a/testsuites/psxtests/psxmsgq04/init.c b/testsuites/psxtests/psxmsgq04/init.c index 599a3f213f..484c472707 100644 --- a/testsuites/psxtests/psxmsgq04/init.c +++ b/testsuites/psxtests/psxmsgq04/init.c @@ -43,29 +43,29 @@ void *POSIX_Init( Queue = mq_open( "Queue", O_CREAT | O_RDWR, 0x777, &attr ); if ( Queue == (-1) ) perror( "mq_open failed" ); - assert( Queue != (-1) ); + rtems_test_assert( Queue != (-1) ); puts( "Init - Open message queue instance 2 - FAIL - ENFILE " ); second_Queue = mq_open( "Queue2", O_CREAT | O_RDWR, 0x777, &attr ); if ( second_Queue != (-1) ) puts( "mq_open did not failed" ); - assert( second_Queue == (-1) ); - assert( errno == ENFILE ); + rtems_test_assert( second_Queue == (-1) ); + rtems_test_assert( errno == ENFILE ); puts( "Init - Unlink message queue instance 1" ); sc = mq_unlink( "Queue" ); if ( sc != 0 ) perror( "mq_unlink failed" ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); puts( "Init - Close message queue instance 1" ); sc = mq_close( Queue ); if ( sc != 0 ) perror( "mq_close failed" ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); sb = rtems_workspace_get_information( &start ); - assert( start.Free.number == 1 ); + rtems_test_assert( start.Free.number == 1 ); to_alloc = start.Free.largest; /* find the largest we can actually allocate */ @@ -91,7 +91,7 @@ void *POSIX_Init( name = Get_Longest_Name(); while ( attr.mq_msgsize > 0 ) { sb = rtems_workspace_allocate( to_alloc, &alloced ); - assert( sb ); + rtems_test_assert( sb ); second_Queue = mq_open(name,O_CREAT | O_RDWR, 0x777, &attr ); @@ -114,13 +114,13 @@ void *POSIX_Init( sc = mq_unlink( name ); if ( sc != 0 ) perror( "mq_unlink failed" ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); puts( "Init - Close message queue" ); sc = mq_close( second_Queue ); if ( sc != 0 ) perror( "mq_close failed" ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); puts( "*** END OF POSIX MESSAGE QUEUE TEST 4 ***" ); rtems_test_exit( 0 ); diff --git a/testsuites/psxtests/psxreaddir/test.c b/testsuites/psxtests/psxreaddir/test.c index 72e6128f9d..f139003ba6 100644 --- a/testsuites/psxtests/psxreaddir/test.c +++ b/testsuites/psxtests/psxreaddir/test.c @@ -15,7 +15,12 @@ * implementation of this appears to seek to the ((off/DIRENT_SIZE) + 1) * record where DIRENT_SIZE seems to be 12 bytes. * + * COPYRIGHT (c) 1989-2009. + * On-Line Applications Research Corporation (OAR). * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. * * $Id$ */ @@ -25,11 +30,9 @@ #include <fcntl.h> #include <dirent.h> #include <string.h> -#include <assert.h> #include <unistd.h> #include <errno.h> #include <rtems/imfs.h> -#include <assert.h> DIR *directory; DIR *directory2; @@ -71,7 +74,7 @@ void complete_printdir( char *path ) int status; the_dir = opendir( path ); - assert( the_dir ); + rtems_test_assert( the_dir ); printdir( the_dir ); status = closedir( the_dir ); } @@ -188,8 +191,8 @@ void test_across_mount(void) */ printf("Validate readdir across mount point\n"); - assert( mkdir( "/imfs", 0777 ) == 0 ); - assert( mkdir( "/imfs/should_be_hidden", 0777 ) == 0 ); + rtems_test_assert( mkdir( "/imfs", 0777 ) == 0 ); + rtems_test_assert( mkdir( "/imfs/should_be_hidden", 0777 ) == 0 ); complete_printdir("/imfs" ); printf("Attempting to mount IMFS file system at /imfs \n"); status = mount( @@ -198,16 +201,16 @@ void test_across_mount(void) RTEMS_FILESYSTEM_READ_WRITE, NULL, "/imfs" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); if( mt_entry == NULL ){ printf(" NULL mount table entry was returned\n"); } printf( "create /imfs/testdir and /imfs/testdir/testsubdir\n"); status = mkdir( "/imfs/testdir", 0777 ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = mkdir( "/imfs/testdir/testsubdir", 0777 ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); complete_printdir("/imfs" ); complete_printdir("/imfs/" ); @@ -273,7 +276,7 @@ int main( printf("open /b/myfile\n"); fd = open ("/b/my_file", O_CREAT, S_IRWXU); - assert( fd != -1 ); + rtems_test_assert( fd != -1 ); close (fd); printf("scandir a file status: "); @@ -287,20 +290,20 @@ int main( printf("Open /b/new_file\n"); fd = open( "/b/new_file", O_CREAT, S_IRWXU ); - assert( fd != -1 ); + rtems_test_assert( fd != -1 ); printf("fcntl F_SETFD should return 0\n"); status = fcntl( fd, F_SETFD, 1 ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("fcntl F_SETFD should return 1\n"); status = fcntl( fd, F_GETFD, 1 ); - assert( status == 1 ); + rtems_test_assert( status == 1 ); #if 0 printf("fcntl F_DUPFD should return 0\n"); status = fcntl( fd, F_DUPFD, 0 ); - assert ( status == 0 ); + rtems_test_assert ( status == 0 ); #else printf("fcntl F_DUPFD should return 0 -- skip until implemented\n"); #endif @@ -308,41 +311,41 @@ int main( printf("fcntl F_GETFL returns current flags\n"); status = fcntl( fd, F_GETFL, 1 ); printf("fcntl F_GETFL returned 0x%x\n", status ); - assert( status != -1 ); + rtems_test_assert( status != -1 ); printf("fcntl F_SETFL to add O_APPEND and O_NONBLOCK\n"); status = fcntl( fd, F_SETFL, O_APPEND|O_NONBLOCK ); - assert ( status != -1 ); + rtems_test_assert ( status != -1 ); printf("fcntl F_GETFL return current flags to see changes\n"); status = fcntl( fd, F_GETFL, 1 ); printf("fcntl F_GETFL returned 0x%x\n", status ); - assert( status != -1 ); + rtems_test_assert( status != -1 ); printf("fcntl F_GETLK should return -1\n"); status = fcntl( fd, F_GETLK, 1 ); - assert ( status == -1 ); + rtems_test_assert ( status == -1 ); printf("fcntl F_SETLK should return -1\n"); status = fcntl( fd, F_SETLK, 1 ); - assert ( status == -1 ); + rtems_test_assert ( status == -1 ); printf("fcntl F_SETLKW should return -1\n"); status = fcntl( fd, F_SETLKW, 1 ); - assert ( status == -1 ); + rtems_test_assert ( status == -1 ); printf("fcntl F_SETOWN should return -1\n"); status = fcntl( fd, F_SETOWN, 1 ); - assert ( status == -1 ); + rtems_test_assert ( status == -1 ); printf("fcntl F_GETOWN should return -1\n"); status = fcntl( fd, F_GETOWN, 1 ); - assert ( status == -1 ); + rtems_test_assert ( status == -1 ); printf("fcntl invalid argument should return -1\n"); status = fcntl( fd, 0xb, 1 ); printf("Status %d\n",status); - assert( status == -1 ); + rtems_test_assert( status == -1 ); printf("opendir and readdir /b/myfile\n"); directory_not = opendir ("/b/my_file"); @@ -354,7 +357,7 @@ int main( printf("chdir to /b/myfile\n"); status = chdir ("/b/my_file"); - assert (status == -1); + rtems_test_assert (status == -1); printf( "\nPerforming stat of directory /\n"); status = stat( "/", &s ); @@ -362,18 +365,18 @@ int main( puts( "\nOpen and print directory /" ); directory = opendir("/"); - assert( directory ); + rtems_test_assert( directory ); printdir(directory); printf("\nmkdir /d/my_dir\n"); status = mkdir( "/d/my_dir", 0x1c0 ); printf("Open /d/my_dir\n"); directory_not = opendir( "/d/my_dir" ); - assert( directory_not ); + rtems_test_assert( directory_not ); printf( "remove /d/my_dir.\n" ); status = rmdir( "/d/my_dir" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf( "close /d/my_dir.\n" ); closedir( directory_not ); @@ -381,14 +384,14 @@ int main( printf( "\nOpening directory /c\n" ); directory2 = opendir("/c"); - assert( directory2 ); + rtems_test_assert( directory2 ); printdir(directory2); status = closedir( directory2 ); printf( "\nOpening directory /c/y\n" ); directory3 = opendir("/c/y"); - assert( directory3 ); + rtems_test_assert( directory3 ); printdir(directory3); status = closedir( directory3 ); diff --git a/testsuites/psxtests/psxrwlock01/test.c b/testsuites/psxtests/psxrwlock01/test.c index d7505bafa1..c704bc1284 100644 --- a/testsuites/psxtests/psxrwlock01/test.c +++ b/testsuites/psxtests/psxrwlock01/test.c @@ -1,7 +1,7 @@ /* * This test exercises the POSIX RWLock manager. * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -11,7 +11,6 @@ * $Id$ */ -#include <assert.h> #include <stdio.h> #include <errno.h> #include <stdlib.h> @@ -37,11 +36,11 @@ void *ReadLockThread(void *arg) puts( "ReadThread - pthread_rwlock_rdlock(RWLock) blocking -- OK" ); status = pthread_rwlock_rdlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); puts( "ReadThread - pthread_rwlock_rdlock(RWLock) unblocked -- OK" ); status = pthread_rwlock_unlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); return NULL; } @@ -54,14 +53,14 @@ void *WriteLockThread(void *arg) puts( "WriteThread - pthread_rwlock_wrlock(RWLock) blocking -- OK" ); status = pthread_rwlock_wrlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); puts( "WriteThread - pthread_rwlock_wrlock(RWLock) unblocked -- OK" ); sleep( 1 ); puts( "WriteThread - pthread_rwlock_unlock(RWLock) -- OK" ); status = pthread_rwlock_unlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); return NULL; } @@ -90,75 +89,75 @@ int main( /*************** NULL POINTER CHECKS *****************/ puts( "pthread_rwlockattr_init( NULL ) -- EINVAL" ); status = pthread_rwlockattr_init( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_setpshared( NULL, private ) -- EINVAL" ); status = pthread_rwlockattr_setpshared( NULL, PTHREAD_PROCESS_PRIVATE ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_setpshared( NULL, shared ) -- EINVAL" ); status = pthread_rwlockattr_setpshared( NULL, PTHREAD_PROCESS_SHARED ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_getpshared( NULL, &p ) -- EINVAL" ); status = pthread_rwlockattr_getpshared( NULL, &p ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_destroy( NULL ) -- EINVAL" ); status = pthread_rwlockattr_destroy( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** NOT INITIALIZED CHECKS *****************/ /* cheat visibility */ attr.is_initialized = 0; puts( "pthread_rwlockattr_setpshared( &attr, shared ) -- EINVAL" ); status = pthread_rwlockattr_setpshared( &attr, PTHREAD_PROCESS_SHARED ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_getpshared( &attr, NULL ) -- EINVAL" ); status = pthread_rwlockattr_getpshared( &attr, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_destroy( &attr ) -- EINVAL" ); status = pthread_rwlockattr_destroy( &attr ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** BAD PSHARED CHECK *****************/ puts( "pthread_rwlockattr_setpshared( &attr, private ) -- EINVAL" ); status = pthread_rwlockattr_setpshared( &attr, ~PTHREAD_PROCESS_PRIVATE ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** ACTUALLY WORK THIS TIME *****************/ puts( "pthread_rwlockattr_init( &attr ) -- OK" ); status = pthread_rwlockattr_init( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlockattr_setpshared( &attr, private ) -- OK" ); status = pthread_rwlockattr_setpshared( &attr, PTHREAD_PROCESS_PRIVATE ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlockattr_getpshared( &attr, &p ) -- OK" ); status = pthread_rwlockattr_getpshared( &attr, &p ); - assert( status == 0 ); - assert( p == PTHREAD_PROCESS_PRIVATE ); + rtems_test_assert( status == 0 ); + rtems_test_assert( p == PTHREAD_PROCESS_PRIVATE ); puts( "pthread_rwlockattr_setpshared( &attr, shared ) -- OK" ); status = pthread_rwlockattr_setpshared( &attr, PTHREAD_PROCESS_SHARED ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlockattr_getpshared( &attr, &p ) -- OK" ); status = pthread_rwlockattr_getpshared( &attr, &p ); - assert( status == 0 ); - assert( p == PTHREAD_PROCESS_SHARED ); + rtems_test_assert( status == 0 ); + rtems_test_assert( p == PTHREAD_PROCESS_SHARED ); /*************** DESTROY/REUSE CHECK *****************/ puts( "pthread_rwlockattr_destroy( &attr ) -- OK" ); status = pthread_rwlockattr_destroy( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlockattr_getpshared( &attr, &p ) destroyed -- EINVAL" ); status = pthread_rwlockattr_getpshared( &attr, &p ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** NULL ARGUMENT CHECKS *****************/ abstime.tv_sec = 0; @@ -166,87 +165,87 @@ int main( puts( "pthread_rwlock_init(NULL, &attr) -- EINVAL" ); status = pthread_rwlock_init(NULL, &attr); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_destroy(NULL) -- EINVAL" ); status = pthread_rwlock_destroy(NULL); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_rdlock(NULL) -- EINVAL" ); status = pthread_rwlock_rdlock(NULL); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedrdlock( NULL, &abstime) -- EINVAL" ); status = pthread_rwlock_timedrdlock( NULL, &abstime); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedrdlock( &rwlock, NULL) -- EINVAL" ); status = pthread_rwlock_timedrdlock( &rwlock, NULL); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_tryrdlock(NULL) -- EINVAL" ); status = pthread_rwlock_tryrdlock(NULL); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_wrlock(NULL) -- EINVAL" ); status = pthread_rwlock_wrlock(NULL); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedwrlock( NULL, &abstime) -- EINVAL" ); status = pthread_rwlock_timedwrlock( NULL, &abstime ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedwrlock( &rwlock, NULL) -- EINVAL" ); status = pthread_rwlock_timedwrlock( &rwlock, NULL); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_trywrlock(NULL) -- EINVAL" ); status = pthread_rwlock_trywrlock(NULL); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_unlock(NULL) -- EINVAL" ); status = pthread_rwlock_unlock(NULL); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** BAD ID CHECK *****************/ rwlock = 1; /* make a valid abstime */ puts( "clock_gettime(CLOCK_REALTIME, &abstime) -- OK" ); status = clock_gettime( CLOCK_REALTIME, &abstime ); - assert( !status ); + rtems_test_assert( !status ); abstime.tv_sec += 5; puts( "pthread_rwlock_destroy(BadId) -- EINVAL" ); status = pthread_rwlock_destroy(&rwlock); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_rdlock(BadId) -- EINVAL" ); status = pthread_rwlock_rdlock(&rwlock); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedrdlock(BadId, &abstime) -- EINVAL" ); status = pthread_rwlock_timedrdlock( &rwlock, &abstime); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_tryrdlock(BadId) -- EINVAL" ); status = pthread_rwlock_tryrdlock(&rwlock); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_wrlock(BadId) -- EINVAL" ); status = pthread_rwlock_wrlock(&rwlock); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedwrlock(BadId, &abstime) -- EINVAL" ); status = pthread_rwlock_timedwrlock( &rwlock, &abstime ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_trywrlock(BadId) -- EINVAL" ); status = pthread_rwlock_trywrlock(&rwlock); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_unlock(BadId) -- EINVAL" ); status = pthread_rwlock_unlock(&rwlock); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** BAD ABSTIME CHECK *****************/ @@ -263,66 +262,66 @@ int main( /*************** ACTUALLY CREATE ONE CHECK *****************/ puts( "pthread_rwlockattr_init( &attr ) -- OK" ); status = pthread_rwlockattr_init( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlock_init( &rwlock, &attr ) -- OK" ); status = pthread_rwlock_init( &rwlock, &attr ); - assert( status == 0 ); - assert( rwlock != 0 ); + rtems_test_assert( status == 0 ); + rtems_test_assert( rwlock != 0 ); puts( "pthread_rwlock_init( &rwlock, &attr ) -- EAGAIN" ); status = pthread_rwlock_init( &rwlock, &attr ); - assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); puts( "pthread_rwlock_destroy( &rwlock ) -- OK" ); status = pthread_rwlock_destroy( &rwlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /********* CREATE RWLOCK WITH DEFAULT ATTRIBUTES AND DESTROY IT *********/ puts( "pthread_rwlock_init( &rwlock, NULL ) -- OK" ); status = pthread_rwlock_init( &rwlock, NULL ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlock_destroy( &rwlock ) -- OK" ); status = pthread_rwlock_destroy( &rwlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** CREATE THREADS AND LET THEM OBTAIN READLOCK ***************/ puts( "pthread_rwlock_init( &RWLock, &attr ) -- OK" ); status = pthread_rwlock_init( &RWLock, &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlock_tryrdlock(RWLock) -- OK" ); status = pthread_rwlock_tryrdlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); for (i=0 ; i<NUMBER_THREADS ; i++ ) { printf( "Init: pthread_create - thread %d OK\n", i+1 ); status = pthread_create(&ThreadIds[i], NULL, ReadLockThread, &ThreadIds[i]); - assert( !status ); + rtems_test_assert( !status ); sleep(1); } puts( "pthread_rwlock_unlock(RWLock) -- OK" ); status = pthread_rwlock_unlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); sleep(1); /*************** CREATE THREADS AND LET THEM OBTAIN READLOCK ***************/ puts( "pthread_rwlock_trywrlock(RWLock) -- OK" ); status = pthread_rwlock_trywrlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); puts( "pthread_rwlock_tryrdlock(&RWLock) -- EBUSY" ); status = pthread_rwlock_tryrdlock(&RWLock); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); for (i=0 ; i<NUMBER_THREADS ; i++ ) { printf( "Init: pthread_create - thread %d OK\n", i+1 ); status = pthread_create(&ThreadIds[i], NULL, ReadLockThread, &ThreadIds[i]); - assert( !status ); + rtems_test_assert( !status ); sleep(1); } @@ -330,101 +329,101 @@ int main( /* Attempt delete while threads are blocked */ puts( "pthread_rwlock_destroy( &RWLock ) -- EBUSY" ); status = pthread_rwlock_destroy( &RWLock ); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); /* now unlock it so the threads can continue */ puts( "pthread_rwlock_unlock(RWLock) -- OK" ); status = pthread_rwlock_unlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); sleep(2); /*************** CREATE THREADS AND LET THEM OBTAIN WRITE LOCK *************/ puts( "pthread_rwlock_trywrlock(RWLock) -- OK" ); status = pthread_rwlock_trywrlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); puts( "pthread_rwlock_trywrlock(&RWLock) -- EBUSY" ); status = pthread_rwlock_trywrlock(&RWLock); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); for (i=0 ; i<NUMBER_THREADS ; i++ ) { printf( "Init: pthread_create - thread %d OK\n", i+1 ); status = pthread_create(&ThreadIds[i], NULL, WriteLockThread, &ThreadIds[i]); - assert( !status ); + rtems_test_assert( !status ); sleep(1); } puts( "pthread_rwlock_unlock(RWLock) -- OK" ); status = pthread_rwlock_unlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); sleep(2); /*************** TIMEOUT ON RWLOCK ***************/ puts( "clock_gettime(CLOCK_REALTIME, &abstime) -- OK" ); status = clock_gettime( CLOCK_REALTIME, &abstime ); - assert( !status ); + rtems_test_assert( !status ); abstime.tv_sec += 1; puts( "pthread_rwlock_timedwrlock( &RWLock, &abstime) -- OK" ); status = pthread_rwlock_timedwrlock( &RWLock, &abstime ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); abstime.tv_sec += 1; puts( "pthread_rwlock_timedrdlock( &RWLock, &abstime) -- ETIMEDOUT" ); status = pthread_rwlock_timedrdlock( &RWLock, &abstime ); - assert( status == ETIMEDOUT ); + rtems_test_assert( status == ETIMEDOUT ); abstime.tv_sec -= 1; puts( "pthread_rwlock_timedrdlock( &RWLock, &abstime) -- ETIMEDOUT" ); status = pthread_rwlock_timedrdlock( &RWLock, &abstime ); - assert( status == ETIMEDOUT ); + rtems_test_assert( status == ETIMEDOUT ); abstime.tv_sec -= 1; puts( "pthread_rwlock_timedwrlock( &RWLock, &abstime) -- ETIMEDOUT" ); status = pthread_rwlock_timedwrlock( &RWLock, &abstime ); - assert( status == ETIMEDOUT ); + rtems_test_assert( status == ETIMEDOUT ); /*************** OBTAIN RWLOCK WITH ABSTIME IN PAST ***************/ status = pthread_rwlock_unlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); abstime.tv_sec -= 1; puts( "pthread_rwlock_timedrdlock( &RWLock, &abstime) -- in past -- OK" ); status = pthread_rwlock_timedrdlock( &RWLock, &abstime ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** OBTAIN RWLOCK FOR WRITE WITH ABSTIME IN PAST ***************/ status = pthread_rwlock_unlock(&RWLock); - assert( !status ); + rtems_test_assert( !status ); abstime.tv_sec -= 1; puts( "pthread_rwlock_timedwrlock( &RWLock, &abstime) -- in past -- OK" ); status = pthread_rwlock_timedwrlock( &RWLock, &abstime ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** DESTROY RWLOCK ***************/ puts( "pthread_rwlock_destroy( &RWLock ) -- OK" ); status = pthread_rwlock_destroy( &RWLock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** OBTAIN A LOCK AND THEN RELEASE IT TWICE ***************/ puts( "pthread_rwlock_init( &rwlock, NULL ) -- OK" ); status = pthread_rwlock_init( &rwlock, NULL ); - assert( status == 0 ); - assert( rwlock != 0 ); + rtems_test_assert( status == 0 ); + rtems_test_assert( rwlock != 0 ); puts( "pthread_rwlock_unlock ( &rwlock ) -- OK" ); status = pthread_rwlock_unlock( &rwlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlock_unlock ( &rwlock ) -- OK" ); status = pthread_rwlock_unlock( &rwlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** END OF TEST *****************/ puts( "*** END OF POSIX RWLOCK TEST 01 ***" ); diff --git a/testsuites/psxtests/psxsem01/init.c b/testsuites/psxtests/psxsem01/init.c index 137ea6f47e..7e037677d5 100644 --- a/testsuites/psxtests/psxsem01/init.c +++ b/testsuites/psxtests/psxsem01/init.c @@ -178,7 +178,7 @@ void *POSIX_Init( puts( "Init: sem_open - sem1 SUCCESSFUL" ); n_sem1 = sem_open( "sem1",O_CREAT, 0777, 1 ); - assert( n_sem1 != SEM_FAILED ); + rtems_test_assert( n_sem1 != SEM_FAILED ); puts( "Init: sem_destroy - named sem1 - EINVAL" ); status = sem_destroy(n_sem1); @@ -218,7 +218,7 @@ void *POSIX_Init( puts( "Init: sem_open - Open an existing sem ( same id )" ); n_sem2 = sem_open("sem1", 0 ); - assert( n_sem2 == n_sem1 ); + rtems_test_assert( n_sem2 == n_sem1 ); /* * Unlink the semaphore, then verify an open of the same name produces a @@ -231,8 +231,8 @@ void *POSIX_Init( puts( "Init: sem_open - Reopen sem1 SUCCESSFUL with a different id" ); n_sem2 = sem_open( "sem1", O_CREAT | O_EXCL, 0777, 1); - assert( n_sem2 != SEM_FAILED ); - assert( n_sem2 != n_sem1 ); + rtems_test_assert( n_sem2 != SEM_FAILED ); + rtems_test_assert( n_sem2 != n_sem1 ); /* * Validate we can call close on a semaphore opened with sem_open. @@ -289,7 +289,7 @@ void *POSIX_Init( status = sem_unlink("sem2"); fatal_posix_service_status( status, -1, "sem_unlink error return status"); fatal_posix_service_status( errno, ENOENT, "sem_unlink errno ENOENT"); - assert( (status == -1) && (errno == ENOENT) ); + rtems_test_assert( (status == -1) && (errno == ENOENT) ); /* Try adding in unlinking before closing... (can we still open?) */ diff --git a/testsuites/psxtests/psxsignal01/init.c b/testsuites/psxtests/psxsignal01/init.c index a36d0846cb..d124bd5b3d 100644 --- a/testsuites/psxtests/psxsignal01/init.c +++ b/testsuites/psxtests/psxsignal01/init.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -124,23 +124,23 @@ void *POSIX_Init( /* unblock Signal and see if it happened */ status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGFPE ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGILL ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGSEGV ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Unblock SIGUSR1 SIGFPE SIGILL SIGSEGV" ); status = sigprocmask( SIG_UNBLOCK, &mask, NULL ); - assert( !status ); + rtems_test_assert( !status ); /* install a signal handler for SIGUSR1 */ Signal_occurred = 0; diff --git a/testsuites/psxtests/psxsignal01/task1.c b/testsuites/psxtests/psxsignal01/task1.c index 930f3cb777..a3883f7968 100644 --- a/testsuites/psxtests/psxsignal01/task1.c +++ b/testsuites/psxtests/psxsignal01/task1.c @@ -7,7 +7,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -30,7 +30,7 @@ void *Task_1( seconds = sleep( 5 ); printf( "Task_1: %d seconds left\n", seconds ); - assert( seconds ); + rtems_test_assert( seconds ); /* switch to Init */ diff --git a/testsuites/psxtests/psxsignal02/init.c b/testsuites/psxtests/psxsignal02/init.c index 7f28d76725..a7b3c7042a 100644 --- a/testsuites/psxtests/psxsignal02/init.c +++ b/testsuites/psxtests/psxsignal02/init.c @@ -35,14 +35,14 @@ void Install_Signal_Handler( sigset_t mask; sc = sigemptyset( &mask ); - assert( !sc ); + rtems_test_assert( !sc ); sc = sigaddset( &mask, SIGUSR1 ); - assert( !sc ); + rtems_test_assert( !sc ); printf( "%s - Unblock SIGUSR1\n", task_name ); sc = pthread_sigmask( SIG_UNBLOCK, &mask, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); } /* @@ -137,43 +137,43 @@ void *POSIX_Init( puts( "Init - Raise my priority" ); sc = pthread_attr_init( &attr ); - assert( !sc ); + rtems_test_assert( !sc ); param.sched_priority = 30; sc = pthread_setschedparam( pthread_self(), SCHED_RR, ¶m ); - assert( !sc ); + rtems_test_assert( !sc ); for ( i=0, test=Threads ; test->priority != -1 ; i++, test++ ) { printf( "Init - Create thread %d, priority=%d\n", i, test->priority ); sc = pthread_attr_init( &attr ); - assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); - assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_attr_setschedpolicy( &attr, SCHED_RR ); - assert( !sc ); + rtems_test_assert( !sc ); param.sched_priority = test->priority; sc = pthread_attr_setschedparam( &attr, ¶m ); - assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_create( &id, &attr, Test_Thread, test ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - sleep - let thread settle - OK" ); delay_request.tv_sec = 0; delay_request.tv_nsec = 50000000; sc = nanosleep( &delay_request, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); } puts( "Init - sending SIGUSR1" ); sc = kill( getpid(), SIGUSR1 ); - assert( !sc ); + rtems_test_assert( !sc ); /* we are just scheduling the signal, not delivering it */ - assert( Signal_occurred == false ); + rtems_test_assert( Signal_occurred == false ); puts( "*** END OF POSIX TEST SIGNAL 02 ***" ); rtems_test_exit(0); 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); diff --git a/testsuites/psxtests/psxsignal05/init.c b/testsuites/psxtests/psxsignal05/init.c index c328d96c72..5324c0799d 100644 --- a/testsuites/psxtests/psxsignal05/init.c +++ b/testsuites/psxtests/psxsignal05/init.c @@ -74,7 +74,7 @@ void *POSIX_Init( true, /* is_global */ false /* check_blocked */ ); - assert( bc ); + rtems_test_assert( bc ); puts( "*** END OF POSIX TEST SIGNAL " TEST_NAME " ***" ); rtems_test_exit(0); diff --git a/testsuites/psxtests/psxspin01/test.c b/testsuites/psxtests/psxspin01/test.c index 9b437cc68f..58fa904bd1 100644 --- a/testsuites/psxtests/psxspin01/test.c +++ b/testsuites/psxtests/psxspin01/test.c @@ -1,7 +1,7 @@ /* * This test exercises the POSIX Spinlock manager. * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -11,7 +11,6 @@ * $Id$ */ -#include <assert.h> #include <stdio.h> #include <errno.h> #include <stdlib.h> @@ -34,7 +33,7 @@ rtems_task SpinlockThread(rtems_task_argument arg) } puts( "pthread_spin_lock( &Spinlock ) from Thread -- OK" ); status = pthread_spin_lock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "sleep to allow main thread to run" ); sleep( 1 ); @@ -46,7 +45,7 @@ rtems_task SpinlockThread(rtems_task_argument arg) puts( "pthread_spin_unlock( &Spinlock ) from Thread -- OK" ); status = pthread_spin_unlock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); rtems_task_delete( RTEMS_SELF ); } @@ -73,96 +72,96 @@ int main( puts( "pthread_spin_init( NULL, PTHREAD_PROCESS_PRIVATE ) -- EINVAL" ); status = pthread_spin_init( NULL, PTHREAD_PROCESS_PRIVATE ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_init( NULL, PTHREAD_PROCESS_SHARED ) -- EINVAL" ); status = pthread_spin_init( NULL, PTHREAD_PROCESS_PRIVATE ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_init( &spinlock, 0x1234 ) -- EINVAL" ); status = pthread_spin_init( &spinlock, 0x1234 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_init( &spinlock, PTHREAD_PROCESS_SHARED ) -- EINVAL" ); status = pthread_spin_init( &spinlock, PTHREAD_PROCESS_SHARED ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* This successfully creates one */ puts( "pthread_spin_init( &Spinlock, PTHREAD_PROCESS_PRIVATE ) -- OK" ); status = pthread_spin_init( &Spinlock, PTHREAD_PROCESS_PRIVATE ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_spin_init( &spinlock, PTHREAD_PROCESS_PRIVATE ) -- EAGAIN" ); status = pthread_spin_init( &spinlock, PTHREAD_PROCESS_PRIVATE ); - assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); puts( "pthread_spin_init( &spinlock, PTHREAD_PROCESS_PRIVATE ) -- EAGAIN" ); status = pthread_spin_init( &spinlock, PTHREAD_PROCESS_PRIVATE ); - assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); puts( "pthread_spin_lock( NULL ) -- EINVAL" ); status = pthread_spin_lock( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_trylock( NULL ) -- EINVAL" ); status = pthread_spin_trylock( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_unlock( NULL ) -- EINVAL" ); status = pthread_spin_unlock( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_destroy( NULL ) -- EINVAL" ); status = pthread_spin_destroy( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); spinlock = 0; puts( "pthread_spin_lock( &spinlock ) -- EINVAL" ); status = pthread_spin_lock( &spinlock ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_trylock( &spinlock ) -- EINVAL" ); status = pthread_spin_trylock( &spinlock ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_unlock( &spinlock ) -- EINVAL" ); status = pthread_spin_unlock( &spinlock ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_destroy( &spinlock ) -- EINVAL" ); status = pthread_spin_destroy( &spinlock ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_unlock( &Spinlock ) -- already unlocked OK" ); status = pthread_spin_unlock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* Now some basic locking and unlocking with a deadlock verification */ puts( "pthread_spin_lock( &Spinlock ) -- OK" ); status = pthread_spin_lock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_spin_lock( &Spinlock ) -- EDEADLK" ); status = pthread_spin_lock( &Spinlock ); - assert( status == EDEADLK ); + rtems_test_assert( status == EDEADLK ); puts( "pthread_spin_trylock( &Spinlock ) -- EDEADLK" ); status = pthread_spin_trylock( &Spinlock ); - assert( status == EDEADLK ); + rtems_test_assert( status == EDEADLK ); puts( "pthread_spin_unlock( &Spinlock ) -- OK" ); status = pthread_spin_unlock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* Try lock/unlock pair */ puts( "pthread_spin_trylock( &Spinlock ) -- OK" ); status = pthread_spin_trylock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_spin_unlock( &Spinlock ) -- OK" ); status = pthread_spin_unlock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* Let another thread lock a spinlock and we contend with it */ @@ -177,10 +176,10 @@ int main( RTEMS_DEFAULT_ATTRIBUTES, &taskid ); - assert( rstatus == RTEMS_SUCCESSFUL ); + rtems_test_assert( rstatus == RTEMS_SUCCESSFUL ); rstatus = rtems_task_start( taskid, SpinlockThread, 0 ); - assert( rstatus == RTEMS_SUCCESSFUL ); + rtems_test_assert( rstatus == RTEMS_SUCCESSFUL ); /* We should be preempted immediately. The thread is expected to: * + verify we haven't set the main thread spinning flag * + lock the spinlock @@ -190,7 +189,7 @@ int main( mainThreadSpinning = 1; puts( "pthread_spin_lock( &Spinlock ) -- OK" ); status = pthread_spin_lock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* The thread wakes up, unlocks spin lock, and deletes itself. * So when we get back here, about a second has passed and we now @@ -200,16 +199,16 @@ int main( /* spin lock should be locked when we return so destroying it gives busy */ puts( "pthread_spin_destroy( &Spinlock ) -- EBUSY" ); status = pthread_spin_destroy( &Spinlock ); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); /* Unlock it for a normal destroy */ puts( "pthread_spin_unlock( &Spinlock ) -- OK" ); status = pthread_spin_unlock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_spin_destroy( &Spinlock ) -- OK" ); status = pthread_spin_destroy( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** END OF TEST *****************/ puts( "*** END OF POSIX SPINLOCK TEST 01 ***" ); diff --git a/testsuites/psxtests/psxspin02/test.c b/testsuites/psxtests/psxspin02/test.c index 827ddbe9c9..de605a0e83 100644 --- a/testsuites/psxtests/psxspin02/test.c +++ b/testsuites/psxtests/psxspin02/test.c @@ -1,7 +1,7 @@ /* * This test exercises the POSIX Spinlock manager. * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -11,7 +11,6 @@ * $Id$ */ -#include <assert.h> #include <stdio.h> #include <errno.h> #include <stdlib.h> @@ -28,11 +27,11 @@ rtems_task SpinlockThread(rtems_task_argument arg) puts( "pthread_spin_trylock( &Spinlock ) -- EBUSY" ); status = pthread_spin_trylock( &Spinlock ); - assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); puts( "pthread_spin_unlock( &Spinlock ) -- EPERM" ); status = pthread_spin_unlock( &Spinlock ); - assert( status == EPERM ); + rtems_test_assert( status == EPERM ); rtems_task_delete( RTEMS_SELF ); } @@ -59,12 +58,12 @@ int main( /* This successfully creates one */ puts( "pthread_spin_init( &Spinlock, PTHREAD_PROCESS_PRIVATE ) -- OK" ); status = pthread_spin_init( &Spinlock, PTHREAD_PROCESS_PRIVATE ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* Lock it */ puts( "pthread_spin_lock( &Spinlock ) -- OK" ); status = pthread_spin_lock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* Create a helper task */ rstatus = rtems_task_create( @@ -75,20 +74,20 @@ int main( RTEMS_DEFAULT_ATTRIBUTES, &taskid ); - assert( rstatus == RTEMS_SUCCESSFUL ); + rtems_test_assert( rstatus == RTEMS_SUCCESSFUL ); rstatus = rtems_task_start( taskid, SpinlockThread, 0 ); - assert( rstatus == RTEMS_SUCCESSFUL ); + rtems_test_assert( rstatus == RTEMS_SUCCESSFUL ); sleep(1); puts( "pthread_spin_unlock( &Spinlock ) -- OK" ); status = pthread_spin_unlock( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_spin_destroy( &Spinlock ) -- OK" ); status = pthread_spin_destroy( &Spinlock ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** END OF TEST *****************/ puts( "*** END OF POSIX SPINLOCK TEST 02 ***" ); diff --git a/testsuites/psxtests/psxstack01/init.c b/testsuites/psxtests/psxstack01/init.c index 76f54d43c3..0e0ee3b0c5 100644 --- a/testsuites/psxtests/psxstack01/init.c +++ b/testsuites/psxtests/psxstack01/init.c @@ -55,28 +55,28 @@ void *POSIX_Init( puts( "Init - Allocate stack from heap" ); Stack_Low = malloc(PTHREAD_MINIMUM_STACK_SIZE); - assert( Stack_Low ); + rtems_test_assert( Stack_Low ); Stack_High = Stack_Low + PTHREAD_MINIMUM_STACK_SIZE; puts( "Init - Initialize thread attribute for user provided stack" ); sc = pthread_attr_init( &attr ); - assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_attr_setstackaddr( &attr, Stack_Low ); - assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_attr_setstacksize( &attr, PTHREAD_MINIMUM_STACK_SIZE ); - assert( !sc ); + rtems_test_assert( !sc ); /* create threads */ sc = pthread_create( &id, &attr, Test_Thread, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - let other thread run" ); delay_request.tv_sec = 0; delay_request.tv_nsec = 5 * 100000000; sc = nanosleep( &delay_request, NULL ); - assert( !sc ); + rtems_test_assert( !sc ); puts( "*** END OF POSIX STACK ATTRIBUTE TEST 01 ***" ); rtems_test_exit(0); diff --git a/testsuites/psxtests/psxstat/test.c b/testsuites/psxtests/psxstat/test.c index 3f4c2e9481..f00407a5c8 100644 --- a/testsuites/psxtests/psxstat/test.c +++ b/testsuites/psxtests/psxstat/test.c @@ -13,7 +13,6 @@ */ #include <tmacros.h> -#include <assert.h> #include <sys/stat.h> #include <fcntl.h> #include <limits.h> @@ -180,7 +179,7 @@ void stat_a_file( int minor2; - assert( file ); + rtems_test_assert( file ); printf( "stat( %s ) returned ", file ); fflush( stdout ); @@ -273,7 +272,7 @@ void make_multiple_files( while ( files[i] ) { printf( "Making file %s\n", files[i] ); status = mknod( files[i], ( S_IFREG | S_IROTH|S_IWOTH ), 0LL ); - assert( !status ); + rtems_test_assert( !status ); i++; } puts( "" ); @@ -290,7 +289,7 @@ void make_multiple_bad_files( while ( files[i] ) { printf( "Making file %s ", files[i] ); status = mknod( files[i], ( S_IFREG | S_IROTH|S_IWOTH ), 0LL ); - assert( status ); + rtems_test_assert( status ); printf( ": %s\n", strerror( errno ) ); i++; } @@ -309,16 +308,16 @@ void make_multiple_links( while ( new[i] && existing[i] ) { printf( "Making file %s\n", new[i] ); status = link( existing[i], new[i] ); - assert( !status ); + rtems_test_assert( !status ); i++; } puts( "" ); status = link( "fred", "bob" ); - assert( status == -1 ); + rtems_test_assert( status == -1 ); status = link( existing[1], "doug/bob" ); - assert( status == -1 ); + rtems_test_assert( status == -1 ); } @@ -329,7 +328,7 @@ void make_too_many_links(void) char name [20]; status = mkdir("/dummy", S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); for (i=1; i<= LINK_MAX; i++) { @@ -337,9 +336,9 @@ void make_too_many_links(void) printf( "Making file %s\n", name ); status = link("/dummy" , name ); if( i < LINK_MAX ) - assert( !status ); + rtems_test_assert( !status ); else - assert( status == -1 ); + rtems_test_assert( status == -1 ); } } @@ -358,22 +357,22 @@ void make_a_symlink( printf( "Making file %s\n", new ); status = symlink( existing, new ); - assert( !status ); + rtems_test_assert( !status ); printf( "Verify with readlink\n"); status = readlink( new, buf, 100 ); len = strlen( existing ); - assert ( status == len ); + rtems_test_assert ( status == len ); status = readlink( new, buf, 3 ); len = strlen( existing ); if (len < 3 ) - assert( status == len ); + rtems_test_assert( status == len ); else - assert( status == 3 ); + rtems_test_assert( status == 3 ); status = strcmp( existing, buf ); - assert( !status ); + rtems_test_assert( !status ); } void make_multiple_symlinks(void) @@ -394,7 +393,7 @@ void make_multiple_symlinks(void) stat_a_file( SymLinks[4] ); status = symlink( "//links", "bob/frank" ); - assert (status == -1); + rtems_test_assert (status == -1); } /* @@ -407,9 +406,9 @@ void make_too_many_symlinks() sprintf( name1, "SymLink%d", i ); status = symlink( "/dummy", name1 ); if( i < MAXSYMLINK ) - assert( !status ); + rtems_test_assert( !status ); else - assert( status == -1 ); + rtems_test_assert( status == -1 ); } } */ @@ -453,7 +452,7 @@ void make_multiple_directories( while ( files[i] ) { printf( "Making directory %s\n", files[i] ); status = mkdir( files[i], S_IRWXU ); - assert( !status ); + rtems_test_assert( !status ); i++; } puts( "" ); @@ -478,8 +477,8 @@ void Cause_faults(void) #if 0 printf("\n\nPass an invalid mode to chmod should fail with EPERM \n" ); status = chmod( Files[0], S_IFREG ); - assert( status == -1 ); - assert( errno == EPERM ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EPERM ); #endif /* @@ -487,12 +486,12 @@ void Cause_faults(void) */ status = chmod( Files[0], S_IXUSR ); - assert( status != -1 ); + rtems_test_assert( status != -1 ); printf("chdir to a file should fail with ENOTDIR\n"); status = chdir( Files[0] ); - assert( status == -1 ); - assert( errno == ENOTDIR ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOTDIR ); /* * Change mode to read/write on a directory. @@ -501,28 +500,28 @@ void Cause_faults(void) printf("Verify RWX permission on %s via access\n", Directories[0]); status = access( Directories[0], ( R_OK | W_OK | X_OK ) ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf( "chmod of %s to Read/Write\n", Directories[0] ); status = chmod( Directories[0], (S_IXGRP | S_IXOTH) ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf( "chmod fred should fail with ENOENT\n" ); status = chmod( "fred", (S_IXGRP | S_IXOTH) ); - assert( status == -1 ); - assert( errno == ENOENT ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOENT ); strcpy(longer_name, Directories[0] ); strcat(longer_name, "/BADNAME" ); printf( "Create under %s should fail with EACCES\n", Directories[0] ); status = mkdir( longer_name , S_IRWXU ); - assert( status == -1 ); - assert( errno == EACCES ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EACCES ); printf("chdir to %s should fail with EACCES\n", Directories[4] ); status = chdir( Directories[4] ); - assert( status == -1 ); - assert( errno == EACCES ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EACCES ); /* * Check stat with a NULL buffer. @@ -530,8 +529,8 @@ void Cause_faults(void) printf("Stat with a NULL buffer should fail with EFAULT\n"); status = stat( Directories[0], NULL ); - assert( status == -1 ); - assert( errno == EFAULT ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EFAULT ); /* * Set current to a directory with no owner permissions. @@ -540,33 +539,33 @@ void Cause_faults(void) printf( "\n\nchmod of %s to Read/Write\n", Directories[0] ); status = chmod( Directories[0], (S_IXGRP | S_IXOTH) ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("mkdir %s should fail with EACCESS\n", longer_name ); status = mkdir( longer_name , S_IRWXU ); - assert( status == -1 ); - assert( errno == EACCES ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EACCES ); printf("\n%s Should exist ( access )\n",Directories[0] ); status = access( Directories[0], F_OK ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("\n%s Should have read permission( access )\n",Directories[0] ); status = access( Directories[0], R_OK ); - assert( status != 0 ); + rtems_test_assert( status != 0 ); printf("\n%s Should have write permission( access )\n",Directories[0] ); status = access( Directories[0], W_OK ); - assert( status != 0 ); + rtems_test_assert( status != 0 ); printf("\n%s Should not have execute permission( access )\n",Directories[0] ); status = access( Directories[0], X_OK ); - assert( status != 0 ); + rtems_test_assert( status != 0 ); printf("\nRestore %s to RWX\n",Directories[0] ); status = chmod( Directories[0], S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("chdir to /my_mount_point \n"); status = chdir( "/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Remove one of the directories. @@ -575,21 +574,21 @@ void Cause_faults(void) printf( "Remove %s\n", Directories[5] ); status = rmdir( Directories[5] ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); stat_a_file( Directories[5] ); status = access( Directories[5], F_OK ); - assert( status != 0 ); + rtems_test_assert( status != 0 ); stat_a_file( Links_to_Dirs[5] ); status = readlink( Links_to_Dirs[5], longer_name, 3 ); - assert( status == -1 ); - assert( errno == EINVAL ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EINVAL ); stat_a_file( Links_to_dirlinks[5] ); printf("Chdir to %s\n", Links_to_Dirs[5] ); status = chdir( Links_to_Dirs[5] ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Verify we cannot move up from a node with no parent node. @@ -597,8 +596,8 @@ void Cause_faults(void) printf("Chdir to .. should fail with ENOENT\n" ); status = chdir( ".." ); - assert( status == -1 ); - assert( errno == ENOENT ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOENT ); /* * Create a subdirectory under the dangling node. @@ -606,16 +605,16 @@ void Cause_faults(void) printf("mkdir ../t should fail with ENOENT\n" ); status = mkdir( "../t" , S_IRWXU ); - assert( status == -1 ); - assert( errno == ENOENT ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOENT ); printf("mkdir t\n"); status = mkdir( "t" , S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("chdir to /my_mount_point\n"); status = chdir( "/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Check rmdir, rmnod, and unlink @@ -623,31 +622,31 @@ void Cause_faults(void) printf("rmdir %s should fail with ENOTDIR\n", Links_to_Dirs[5] ); status = rmdir( Links_to_Dirs[5] ); - assert( status == -1 ); - assert( errno == ENOTDIR ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOTDIR ); printf("unlink %s\n", Links_to_Dirs[5] ); status = unlink( Links_to_Dirs[5] ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("unlink %s should fail with ENOTEMPTY\n", Links_to_dirlinks[5] ); status = unlink( Links_to_dirlinks[5] ); - assert( status == -1 ); - assert( errno == ENOTEMPTY ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == ENOTEMPTY ); strcpy( longer_name, Links_to_dirlinks[5] ); strcat( longer_name, "/t"); printf("rmdir %s\n", longer_name ); status = rmdir( longer_name ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("unlink %s\n", Links_to_Dirs[5]); status = unlink( Links_to_dirlinks[5] ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = chdir( Directories[0] ); status = mkdir ( "my_mount_point", S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("Attempting to mount IMFS file system at /dir1/my_mount_point \n"); status = mount( @@ -656,16 +655,16 @@ void Cause_faults(void) RTEMS_FILESYSTEM_READ_WRITE, NULL, "/my_mount_point/dir1/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("rmdir /dir1/my_mount_point should fail with EBUSY\n"); status = rmdir ("/my_mount_point/dir1/my_mount_point" ); - assert( status == -1 ); - assert( errno == EBUSY ); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EBUSY ); printf( "Unmount /my_mount_point/dir1/my_mount_point\n"); status = unmount( "/my_mount_point/dir1/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* * Verify write permission is checked. @@ -673,30 +672,30 @@ void Cause_faults(void) printf("chmod of %s to group and other execute\n", Files[0] ); status = chmod (Files[0], (S_IXGRP | S_IXOTH) ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); printf("Open %s for write should fail with EACCES\n", Files[0] ); fd = open (Files[0], O_WRONLY); - assert( fd == -1 ); - assert( errno == EACCES ); + rtems_test_assert( fd == -1 ); + rtems_test_assert( errno == EACCES ); printf("chmod of %s to User Execute and Read\n", Directories[3] ); status = chmod (Directories[3], (S_IXUSR | S_IRUSR) ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); strcpy(longer_name, Directories[3] ); strcat(longer_name, "/NewFile" ); printf("Mkdir of %s should fail with EACCES\n",longer_name ); status = mkdir( longer_name, S_IRWXU ); - assert( status != 0 ); - assert( errno == EACCES ); + rtems_test_assert( status != 0 ); + rtems_test_assert( errno == EACCES ); printf("Making too many hard links.\n" ); make_too_many_links( ); printf( "pass fstat a null pointer should fail with EFAULT\n"); status = fstat( fd, NULL ); - assert( status == -1 ); - assert( errno == EFAULT); + rtems_test_assert( status == -1 ); + rtems_test_assert( errno == EFAULT); /* * The current directory MUST be restored at the end of this test. @@ -704,7 +703,7 @@ void Cause_faults(void) printf("chdir to /my_mount_point \n"); status = chdir( "/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); } @@ -748,18 +747,18 @@ int main( */ status = mkdir("/my_mount_point", S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = mount( &mt_entry, &IMFS_ops, RTEMS_FILESYSTEM_READ_WRITE, NULL, "my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = chdir( "/my_mount_point" ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); status = mkdir("dev", S_IRWXU ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /* diff --git a/testsuites/psxtests/psxtime/test.c b/testsuites/psxtests/psxtime/test.c index d0fd09f6d3..790f698eb5 100644 --- a/testsuites/psxtests/psxtime/test.c +++ b/testsuites/psxtests/psxtime/test.c @@ -13,7 +13,6 @@ */ #include <tmacros.h> -#include <assert.h> #include <sys/stat.h> #include <fcntl.h> #include <stdio.h> @@ -67,16 +66,16 @@ void check_a_tod( print_time( "rtems_clock_set ", the_tod, "\n" ); status = rtems_clock_set( the_tod ); - assert( !status ); + rtems_test_assert( !status ); do { status = rtems_clock_get_tod( &new_tod ); - assert( !status ); + rtems_test_assert( !status ); print_time( "rtems_clock_get_tod ", &new_tod, "\n" ); /* now do the posix time gets */ result = gettimeofday( &tv, 0 ); - assert( result == 0 ); + rtems_test_assert( result == 0 ); a_time_t = tv.tv_sec; /* ctime() takes a time_t */ printf( "gettimeofday: %s", ctime( &a_time_t) ); @@ -110,7 +109,7 @@ void test_adjtime(void) print_time( "rtems_clock_set ", the_tod, "\n" ); status = rtems_clock_set( the_tod ); - assert( !status ); + rtems_test_assert( !status ); delta.tv_sec = 0; delta.tv_usec = 0; @@ -119,56 +118,56 @@ void test_adjtime(void) puts( "adjtime - NULL delta - EINVAL" ); sc = adjtime( NULL, &olddelta ); - assert( sc == -1 ); - assert( errno == EINVAL ); + rtems_test_assert( sc == -1 ); + rtems_test_assert( errno == EINVAL ); puts( "adjtime - delta out of range - EINVAL" ); delta.tv_usec = 1000000000; /* 100 seconds worth */ sc = adjtime( &delta, &olddelta ); - assert( sc == -1 ); - assert( errno == EINVAL ); + rtems_test_assert( sc == -1 ); + rtems_test_assert( errno == EINVAL ); puts( "adjtime - delta too small - do nothing" ); delta.tv_sec = 0; delta.tv_usec = 1; sc = adjtime( &delta, &olddelta ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); puts( "adjtime - delta too small - do nothing, olddelta=NULL" ); sc = adjtime( &delta, NULL ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); puts( "adjtime - delta of one second forward" ); delta.tv_sec = 1; delta.tv_usec = 0; sc = adjtime( &delta, &olddelta ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); puts( "adjtime - delta of almost two seconds forward" ); delta.tv_sec = 1; delta.tv_usec = 1000000 - 1; sc = adjtime( &delta, &olddelta ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); /* * spin until over 1/2 of the way to the */ ticks = rtems_clock_get_ticks_per_second(); - assert( ticks ); + rtems_test_assert( ticks ); ticks /= 2; do { status = rtems_clock_get_tod( &tod ); - assert( !status ); + rtems_test_assert( !status ); } while ( tod.ticks <= ticks ); puts( "adjtime - delta of almost one second forward which bumps second" ); delta.tv_sec = 0; delta.tv_usec = 1000000 - 1; sc = adjtime( &delta, &olddelta ); - assert( sc == 0 ); + rtems_test_assert( sc == 0 ); status = rtems_clock_get_tod( &tod ); - assert( !status ); + rtems_test_assert( !status ); print_time( "rtems_clock_get_tod ", &tod, "\n" ); } diff --git a/testsuites/psxtests/psxualarm/init.c b/testsuites/psxtests/psxualarm/init.c index 8c49d7f38e..82a4d8d251 100644 --- a/testsuites/psxtests/psxualarm/init.c +++ b/testsuites/psxtests/psxualarm/init.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -79,12 +79,12 @@ void *POSIX_Init( /* unblock Signal and see if it happened */ status = sigemptyset( &mask ); - assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGALRM ); - assert( !status ); + rtems_test_assert( !status ); puts( "Init: Unblock SIGALRM" ); status = sigprocmask( SIG_UNBLOCK, &mask, NULL ); - assert( !status ); + rtems_test_assert( !status ); status = sleep(10); /* stop ularm */ |