From 33c46f1a7014a1aa2e403aa7d089259cd09508b1 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 21 Oct 2010 21:22:25 +0000 Subject: 2010-10-21 Joel Sherrill * psx02/init.c, psx02/task.c, psx03/init.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, psxitimer/init.c, psxkey01/task.c, psxkey02/init.c, psxkey03/init.c, psxmount/test.c, psxmsgq01/init.c, psxmsgq03/init.c, psxmsgq04/init.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, psxstack02/init.c, psxualarm/init.c: Eliminate double space after parenthesis on rtems_test_assert(). --- testsuites/psxtests/ChangeLog | 18 +++ testsuites/psxtests/psx02/init.c | 26 ++--- testsuites/psxtests/psx02/task.c | 4 +- testsuites/psxtests/psx03/init.c | 42 +++---- testsuites/psxtests/psx04/init.c | 174 +++++++++++++-------------- testsuites/psxtests/psx04/task1.c | 2 +- testsuites/psxtests/psx04/task2.c | 2 +- testsuites/psxtests/psx04/task3.c | 24 ++-- testsuites/psxtests/psx05/init.c | 200 ++++++++++++++++---------------- testsuites/psxtests/psx05/task.c | 4 +- testsuites/psxtests/psx05/task2.c | 4 +- testsuites/psxtests/psx05/task3.c | 6 +- testsuites/psxtests/psx06/init.c | 20 ++-- testsuites/psxtests/psx06/task.c | 4 +- testsuites/psxtests/psx06/task2.c | 4 +- testsuites/psxtests/psx07/init.c | 2 +- testsuites/psxtests/psx08/init.c | 16 +-- testsuites/psxtests/psx08/task2.c | 4 +- testsuites/psxtests/psx08/task3.c | 2 +- testsuites/psxtests/psx09/init.c | 34 +++--- testsuites/psxtests/psx10/init.c | 92 +++++++-------- testsuites/psxtests/psx10/task.c | 14 +-- testsuites/psxtests/psx10/task2.c | 6 +- testsuites/psxtests/psx10/task3.c | 4 +- testsuites/psxtests/psx11/init.c | 26 ++--- testsuites/psxtests/psx11/task.c | 6 +- testsuites/psxtests/psx12/init.c | 26 ++--- testsuites/psxtests/psxalarm01/init.c | 12 +- testsuites/psxtests/psxbarrier01/test.c | 78 ++++++------- testsuites/psxtests/psxcancel01/init.c | 4 +- testsuites/psxtests/psxchroot01/test.c | 12 +- testsuites/psxtests/psxitimer/init.c | 22 ++-- testsuites/psxtests/psxkey01/task.c | 4 +- testsuites/psxtests/psxkey02/init.c | 26 ++--- testsuites/psxtests/psxkey03/init.c | 20 ++-- testsuites/psxtests/psxmount/test.c | 90 +++++++------- testsuites/psxtests/psxmsgq01/init.c | 32 ++--- testsuites/psxtests/psxmsgq03/init.c | 4 +- testsuites/psxtests/psxmsgq04/init.c | 18 +-- testsuites/psxtests/psxrwlock01/test.c | 152 ++++++++++++------------ testsuites/psxtests/psxsem01/init.c | 10 +- testsuites/psxtests/psxsignal01/init.c | 12 +- testsuites/psxtests/psxsignal01/task1.c | 2 +- testsuites/psxtests/psxsignal02/init.c | 26 ++--- testsuites/psxtests/psxsignal03/init.c | 36 +++--- testsuites/psxtests/psxsignal05/init.c | 2 +- testsuites/psxtests/psxspin01/test.c | 60 +++++----- testsuites/psxtests/psxspin02/test.c | 16 +-- testsuites/psxtests/psxstack01/init.c | 10 +- testsuites/psxtests/psxstack02/init.c | 6 +- testsuites/psxtests/psxualarm/init.c | 6 +- 51 files changed, 722 insertions(+), 704 deletions(-) (limited to 'testsuites') diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index d2809a403b..271f50ad08 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,3 +1,21 @@ +2010-10-21 Joel Sherrill + + * psx02/init.c, psx02/task.c, psx03/init.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, psxitimer/init.c, + psxkey01/task.c, psxkey02/init.c, psxkey03/init.c, psxmount/test.c, + psxmsgq01/init.c, psxmsgq03/init.c, psxmsgq04/init.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, psxstack02/init.c, psxualarm/init.c: Eliminate + double space after parenthesis on rtems_test_assert(). + 2010-10-08 Ralf Corsépius * psx07/init.c: Add HAVE_DECL_PTHREAD_ATTR_SETGUARDSIZE guard around diff --git a/testsuites/psxtests/psx02/init.c b/testsuites/psxtests/psx02/init.c index 6530f1bfee..b5971bafff 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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); printf( "Init: Block SIGUSR1\n" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigpending( &pending_set ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigpending( &pending_set ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* create a thread */ status = pthread_create( &Task_id, NULL, Task_1_through_3, NULL ); - rtems_test_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 ) { - rtems_test_assert( errno == EINTR ); - rtems_test_assert( tr.tv_nsec || tr.tv_sec ); + rtems_test_assert( errno == EINTR ); + rtems_test_assert( tr.tv_nsec || tr.tv_sec ); } else if ( !status ) { - rtems_test_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 84a6fbc735..13487ee1d3 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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); seconds = sleep( 1 ); - rtems_test_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 4efc0d599c..003954e00f 100644 --- a/testsuites/psxtests/psx03/init.c +++ b/testsuites/psxtests/psx03/init.c @@ -77,17 +77,17 @@ void *POSIX_Init( /* initialize the signal set we will wait for to SIGUSR1 */ status = sigemptyset( &waitset ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &waitset, SIGUSR1 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR2 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); printf( "Init: Block SIGUSR2\n" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* create a thread */ status = pthread_create( &Task_id, NULL, Task_1, NULL ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - 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 */ + 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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); siginfo.si_code = -1; siginfo.si_signo = -1; siginfo.si_value.sival_int = -1; status = sigemptyset( &waitset ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &waitset, SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &waitset, SIGUSR2 ); - rtems_test_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 ); - 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 */ + 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/psx04/init.c b/testsuites/psxtests/psx04/init.c index 76ef33bb4c..b09b5d1634 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) ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); Signal_occurred = 0; @@ -177,30 +177,30 @@ void *POSIX_Init( empty_line(); status = sigemptyset( &mask ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR1" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigpending( &pending_set ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigpending( &pending_set ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR1" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigpending( &pending_set ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* switch to task 1 */ puts( "Init: send SIGUSR1 to process" ); status = kill( getpid(), SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigpending( &pending_set ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGALRM ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: Unblock SIGALRM" ); status = sigprocmask( SIG_UNBLOCK, &mask, NULL ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( remaining == 2 ); + rtems_test_assert( remaining == 2 ); /* test SIG_SETMASK case and returning oset of pthread_sigmask */ empty_line(); status = sigemptyset( &mask ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR2 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* return blocked mask to no signals blocked */ status = sigemptyset( &mask ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigemptyset( &mask ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: sigsuspend for any signal" ); status = sigsuspend( &mask ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* switch to task 1 */ @@ -355,71 +355,71 @@ void *POSIX_Init( /* Send SIGUSR1, Task_3 has issued a sigwaitinfo */ status = sigemptyset( &mask ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR1" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: send SIGUSR1 to process" ); status = kill( getpid(), SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: sleep so the Task_3 can receive SIGUSR1" ); remaining = sleep( 1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* Send SIGUSR1, Task_3 has issued a sigwait */ status = sigemptyset( &mask ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR1" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: send SIGUSR1 to process" ); status = kill( getpid(), SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: sleep so the Task_3 can receive SIGUSR1" ); remaining = sleep( 1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* Send SIGUSR1, Task_3 has issued a sigwaitinfo */ status = sigemptyset( &mask ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR2 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: Block SIGUSR2" ); status = sigprocmask( SIG_BLOCK, &mask, NULL ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: send SIGUSR2 to process" ); status = kill( getpid(), SIGUSR2 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: sleep so the Task_3 can receive SIGUSR2" ); remaining = sleep( 1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* Suspend for signal that has already be sent */ status = sigemptyset( &mask ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: sigsuspend for any signal" ); status = sigsuspend( &mask ); - rtems_test_assert( status ); + rtems_test_assert( status ); printf( "Init: awakended from sigsuspend status=%d \n", status ); /* generate error cases for psignal */ @@ -429,156 +429,156 @@ void *POSIX_Init( status = sigemptyset( NULL ); if ( status != -1 ) printf( "status = %d\n", status ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigdelset - EINVAL (set invalid)" ); status = sigdelset( &mask, 0 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: sigdelset - SUCCESSFUL (signal = 0)" ); status = sigdelset( &mask, 999 ); if ( status != -1 ) printf( "status = %d\n", status ); - rtems_test_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 ); - rtems_test_assert( errno == EINVAL ); + rtems_test_assert( errno == EINVAL ); puts( "Init: sigismember - EINVAL (set invalid)" ); status = sigismember( &mask, 0 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: sigismember - SUCCESSFUL (signal = 0)" ); status = sigismember( &mask, 999 ); if ( status != -1 ) printf( "status = %d\n", status ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 53d5dc877d..71d5eee5bd 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 ); - rtems_test_assert( seconds ); + rtems_test_assert( seconds ); /* switch to Init */ diff --git a/testsuites/psxtests/psx04/task2.c b/testsuites/psxtests/psx04/task2.c index 38af348d48..189d71bd68 100644 --- a/testsuites/psxtests/psx04/task2.c +++ b/testsuites/psxtests/psx04/task2.c @@ -28,7 +28,7 @@ void *Task_2( printf( "Task_2: sending SIGUSR1\n" ); status = pthread_kill( Init_id, SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* switch to Init */ diff --git a/testsuites/psxtests/psx04/task3.c b/testsuites/psxtests/psx04/task3.c index c411f39a6d..41b19153a6 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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* catch signal with sigwaitinfo */ empty_line(); status = sigemptyset( &mask ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - rtems_test_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 */ - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); printf( "Task_3: sigwait SIGUSR1\n" ); status = sigwait( &mask, &sig ); /* switch to Init */ - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGUSR1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); printf( "Task_3: pause\n" ); status = pause( ); /* switch to Init */ - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); printf( "Task_3: sleep so the Init task can reguest a signal\n" ); remaining = sleep( 1 ); - rtems_test_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 bb75855e6b..3f01b94e5a 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 ); - rtems_test_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" ); - rtems_test_assert( 0 ); + rtems_test_assert( 0 ); break; } /* priority ceiling */ status = pthread_mutexattr_getprioceiling( attr, &prioceiling ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); printf( "%smutex priority ceiling is %d\n", msg, prioceiling ); /* process shared */ status = pthread_mutexattr_getpshared( attr, &pshared ); - rtems_test_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" ); - rtems_test_assert( 0 ); + rtems_test_assert( 0 ); break; } } @@ -123,7 +123,7 @@ void *POSIX_Init( int old_ceiling; int priority; - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_init - SUCCESSFUL" ); status = pthread_mutexattr_init( &attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); Print_mutexattr( "Init: ", &attr ); /* create an "uninitialized" attribute structure */ status = pthread_mutexattr_init( &destroyed_attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutexattr_destroy - SUCCESSFUL" ); status = pthread_mutexattr_destroy( &destroyed_attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutexattr_destroy - EINVAL (NULL attr)" ); status = pthread_mutexattr_destroy( NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_destroy - EINVAL (not initialized)" ); status = pthread_mutexattr_destroy( &destroyed_attr ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getpshared - EINVAL (NULL pshared)" ); status = pthread_mutexattr_getpshared( &attr, NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getpshared - EINVAL (not initialized)" ); status = pthread_mutexattr_getpshared( &destroyed_attr, &pshared ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getprotocol - EINVAL (NULL protocol)" ); status = pthread_mutexattr_getprotocol( &attr, NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getprotocol - EINVAL (not initialized)" ); status = pthread_mutexattr_getprotocol( &destroyed_attr, &protocol ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprotocol - EINVAL (NULL attr)" ); status = pthread_mutexattr_setprotocol( NULL, PTHREAD_PRIO_NONE ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprotocol - EINVAL (invalid protocol)" ); status = pthread_mutexattr_setprotocol( &attr, -1 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprotocol - EINVAL (not initialized)" ); status = pthread_mutexattr_setprotocol( &destroyed_attr, -1 ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getprioceiling - EINVAL (NULL prioceiling)" ); status = pthread_mutexattr_getprioceiling( &attr, NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_getprioceiling - EINVAL (not initialized)" ); status = pthread_mutexattr_getprioceiling( &destroyed_attr, &ceiling ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprioceiling - EINVAL (NULL attr)" ); status = pthread_mutexattr_setprioceiling( NULL, 128 ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutexattr_setprioceiling - EINVAL (not initialized)" ); status = pthread_mutexattr_setprioceiling( &destroyed_attr, -1 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* create a thread */ status = pthread_create( &Task_id, NULL, Task_1, NULL ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* bad kind */ status = pthread_mutexattr_init( &attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - EINVAL (invalid type)" ); attr.type = -1; status = pthread_mutex_init( &Mutex_id, &attr ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: Changing mutex attributes" ); status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_mutexattr_setprioceiling( &attr, (sched_get_priority_max(SCHED_FIFO) / 2) + 1 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_mutexattr_setpshared( &attr, PTHREAD_PROCESS_SHARED ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); Print_mutexattr( "Init: ", &attr ); puts( "Init: Resetting mutex attributes" ); status = pthread_mutexattr_init( &attr ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - EAGAIN (too many)" ); status = pthread_mutex_init( &Mutex3_id, &attr ); - rtems_test_assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); puts( "Init: pthread_mutexattr_destroy - SUCCESSFUL" ); status = pthread_mutexattr_destroy( &attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_destroy - SUCCESSFUL" ); status = pthread_mutex_destroy( &Mutex2_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_destroy - EINVAL (invalid id)" ); status = pthread_mutex_destroy( &Mutex_bad_id ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - SUCCESSFUL" ); status = pthread_mutex_init( &Mutex2_id, &attr ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); puts( "Init: pthread_mutex_unlock - SUCCESSFUL" ); status = pthread_mutex_unlock( &Mutex2_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_destroy - SUCCESSFUL" ); status = pthread_mutex_destroy( &Mutex2_id ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutexattr_setprotocol - SUCCESSFUL (PTHREAD_PRIO_INHERIT)" ); status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - SUCCESSFUL" ); status = pthread_mutex_init( &Mutex2_id, &attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_trylock - SUCCESSFUL" ); status = pthread_mutex_trylock( &Mutex2_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* create a thread at a lower priority */ status = pthread_create( &Task2_id, NULL, Task_2, NULL ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* switching to Task2 */ status = pthread_getschedparam( pthread_self(), &policy, ¶m ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutexattr_destroy - SUCCESSFUL" ); status = pthread_mutexattr_destroy( &attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_destroy - SUCCESSFUL" ); status = pthread_mutex_destroy( &Mutex2_id ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutexattr_setprotocol - SUCCESSFUL (PTHREAD_PRIO_PROTECT)" ); status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_PROTECT ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_init - SUCCESSFUL" ); status = pthread_mutex_init( &Mutex2_id, &attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_mutex_getprioceiling - EINVAL (invalid id)" ); status = pthread_mutex_getprioceiling( &Mutex_bad_id, &ceiling ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutex_getprioceiling - EINVAL (NULL ceiling)" ); status = pthread_mutex_getprioceiling( &Mutex2_id, NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); status = pthread_mutex_getprioceiling( &Mutex2_id, &ceiling ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_mutex_setprioceiling - EINVAL (NULL ceiling)" ); status = pthread_mutex_setprioceiling( &Mutex2_id, 128, NULL ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); printf( "Init: pthread_mutex_setprioceiling - old ceiling = %d\n",old_ceiling ); status = pthread_getschedparam( pthread_self(), &policy, ¶m ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_getschedparam( pthread_self(), &policy, ¶m ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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" ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); sleep( 1 ); /* switch to task 3 */ puts( "Init: pthread_mutex_unlock - SUCCESSFUL" ); status = pthread_mutex_unlock( &Mutex2_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_mutex_getprioceiling( &Mutex2_id, &ceiling ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 7ba54ae36e..a546f3ecdd 100644 --- a/testsuites/psxtests/psx05/task.c +++ b/testsuites/psxtests/psx05/task.c @@ -31,13 +31,13 @@ void *Task_1( status = pthread_mutex_trylock( &Mutex_id ); if ( status != EBUSY ) printf( "status = %d\n", status ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* switch to init */ diff --git a/testsuites/psxtests/psx05/task2.c b/testsuites/psxtests/psx05/task2.c index 0e73fe23ec..7e8597de68 100644 --- a/testsuites/psxtests/psx05/task2.c +++ b/testsuites/psxtests/psx05/task2.c @@ -30,14 +30,14 @@ void *Task_2( status = pthread_mutex_lock( &Mutex2_id ); if ( status ) printf( "status =%d\n", status ); - rtems_test_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 ); - rtems_test_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 2f2cf0eb45..5b91f8f0e9 100644 --- a/testsuites/psxtests/psx05/task3.c +++ b/testsuites/psxtests/psx05/task3.c @@ -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" ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); printf( "Task 3: unlock Mutex 2\n" ); status = pthread_mutex_unlock( &Mutex2_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_getschedparam( pthread_self(), &policy, ¶m ); - rtems_test_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 7d19e3f7a2..ee1c636763 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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_create( &Task2_id, NULL, Task_2, NULL ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); puts( "Init: pthread_setspecific - EINVAL (invalid key)" ); status = pthread_setspecific( (pthread_t) -1, &Data_array[ 0 ] ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_getspecific - EINVAL (invalid key)" ); key_data = pthread_getspecific( (pthread_t) -1 ); - rtems_test_assert( !key_data ); + rtems_test_assert( !key_data ); puts( "Init: pthread_key_delete - EINVAL (invalid key)" ); status = pthread_key_delete( (pthread_t) -1 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 e29f823374..40dca84c45 100644 --- a/testsuites/psxtests/psx06/task.c +++ b/testsuites/psxtests/psx06/task.c @@ -32,14 +32,14 @@ void *Task_1( status = pthread_setspecific( Key_id, &Data_array[ 1 ] ); if ( status ) printf( "status = %d\n", status ); - rtems_test_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 ); - rtems_test_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 de981e5a26..a5a46781a8 100644 --- a/testsuites/psxtests/psx06/task2.c +++ b/testsuites/psxtests/psx06/task2.c @@ -33,14 +33,14 @@ void *Task_2( status = pthread_setspecific( Key_id, &Data_array[ 2 ] ); if ( status ) printf( "status = %d\n", status ); - rtems_test_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 ); - rtems_test_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 a781db0db9..57d3325b62 100644 --- a/testsuites/psxtests/psx07/init.c +++ b/testsuites/psxtests/psx07/init.c @@ -685,7 +685,7 @@ void *POSIX_Init( posix_service_failed( status, "pthread_attr_setschedparam"); status = pthread_create( &Task2_id, &attr, Task_2, NULL ); - rtems_test_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 ec68b0c5fe..56ae5428e5 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 ); - rtems_test_assert( status == ESRCH ); + rtems_test_assert( status == ESRCH ); /* detach this thread */ puts( "Init: pthread_detach self" ); status = pthread_detach( pthread_self() ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* create thread */ status = pthread_create( &Task1_id, NULL, Task_1, NULL ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_join - ESRCH (invalid id)" ); status = pthread_join( (pthread_t) -1, &return_pointer ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_create( &Task3_id, NULL, Task_3, NULL ); - rtems_test_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 ); - rtems_test_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 612176404f..4ea3010844 100644 --- a/testsuites/psxtests/psx08/task2.c +++ b/testsuites/psxtests/psx08/task2.c @@ -37,13 +37,13 @@ void *Task_2( status = pthread_join( Init_id, NULL ); if ( status != EINVAL ) printf( "status = %d\n", status ); - rtems_test_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 ); - rtems_test_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 e09c239e38..d7803656e4 100644 --- a/testsuites/psxtests/psx08/task3.c +++ b/testsuites/psxtests/psx08/task3.c @@ -33,7 +33,7 @@ void *Task_3( puts( "Task_3: returned from pthread_join" ); if ( status ) printf( "status = %d\n", status ); - rtems_test_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 4b6af0242d..942caa63c4 100644 --- a/testsuites/psxtests/psx09/init.c +++ b/testsuites/psxtests/psx09/init.c @@ -73,7 +73,7 @@ void *POSIX_Init( puts( "Init: pthread_getschedparam - SUCCESSFUL" ); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - current priority = %d", priority ); @@ -89,10 +89,10 @@ void *POSIX_Init( puts( "Init: pthread_setschedparam - SUCCESSFUL (sporadic server)" ); status = pthread_setschedparam( pthread_self(), SCHED_SPORADIC, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - new priority = %d", priority ); @@ -102,7 +102,7 @@ void *POSIX_Init( for ( passes=0 ; passes <= 3 ; ) { status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); if ( priority != schedparam.sched_priority ) { priority = schedparam.sched_priority; @@ -117,7 +117,7 @@ void *POSIX_Init( empty_line(); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); schedparam.sched_ss_repl_period.tv_sec = 0; schedparam.sched_ss_repl_period.tv_nsec = 500000000; /* 1/2 second */ @@ -133,23 +133,23 @@ void *POSIX_Init( puts( "Init: pthread_setschedparam - SUCCESSFUL (sporadic server)" ); status = pthread_setschedparam( pthread_self(), SCHED_SPORADIC, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: Initializing mutex attributes for priority ceiling" ); status = pthread_mutexattr_init( &attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - new priority = %d", priority ); @@ -163,11 +163,11 @@ void *POSIX_Init( status = pthread_mutex_lock( &Mutex_id ); if ( status ) printf( "status = %d %s\n", status, strerror(status) ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); for ( ; ; ) { status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); if ( schedparam.sched_priority == LOW_PRIORITY ) { puts( "ERROR - Init's priority lowered while holding mutex" ); @@ -183,7 +183,7 @@ void *POSIX_Init( print_current_time( "Init: ", buffer ); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - new priority = %d", priority ); @@ -198,10 +198,10 @@ void *POSIX_Init( status = pthread_mutex_unlock( &Mutex_id ); if ( status ) printf( "status = %d\n", status ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); priority = schedparam.sched_priority; sprintf( buffer, " - new priority = %d", priority ); @@ -209,14 +209,14 @@ void *POSIX_Init( for ( ; ; ) { status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); if ( schedparam.sched_priority == LOW_PRIORITY ) break; } status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - rtems_test_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 488a501adf..9b6d37148e 100644 --- a/testsuites/psxtests/psx10/init.c +++ b/testsuites/psxtests/psx10/init.c @@ -29,61 +29,61 @@ void *POSIX_Init( puts( "Init: pthread_condattr_init" ); status = pthread_condattr_init( &attr ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_condattr_destroy" ); status = pthread_condattr_destroy( &attr ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_condattr_init" ); status = pthread_condattr_init( &attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_condattr_setpshared - PTHREAD_PROCESS_SHARED" ); status = pthread_condattr_setpshared( &attr, PTHREAD_PROCESS_SHARED ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_condattr_setpshared - PTHREAD_PROCESS_PRIVATE" ); status = pthread_condattr_setpshared( &attr, PTHREAD_PROCESS_PRIVATE ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_condattr_setpshared( NULL, PTHREAD_PROCESS_PRIVATE ); if ( status != EINVAL ) printf( "status = %d\n", status ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_condattr_setpshared - EINVAL (pshared invalid)" ); status = pthread_condattr_getpshared( &attr, &pshared ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* signal task1 with a condition variable */ empty_line(); status = pthread_create( &Task_id, NULL, Task_1, NULL ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); empty_line(); status = pthread_create( &Task2_id, NULL, Task_2, NULL ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* set timeout to 3 seconds */ status = clock_gettime( CLOCK_REALTIME, &timeout ); - rtems_test_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 ); - rtems_test_assert( status == ETIMEDOUT ); + rtems_test_assert( status == ETIMEDOUT ); puts( "Init: pthread_cond_timedwait - ETIMEDOUT - (mutex not acquired)" ); status = pthread_mutex_unlock( &Mutex_id ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_cond_wait( NULL, &Mutex_id ); if ( status != EINVAL ) printf( "status = %d\n", status ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "Init: pthread_cond_timedwait - EINVAL (abstime NULL)" ); status = clock_gettime( CLOCK_REALTIME, &timeout ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_mutex_lock( &Mutex_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* ensure we do not catch a 0 nanosecond boundary */ do { status = clock_gettime( CLOCK_REALTIME, &timeout ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - * rtems_test_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 ); - * rtems_test_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 ); - * rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 8e53bc4927..8cbcdaf6d3 100644 --- a/testsuites/psxtests/psx10/task.c +++ b/testsuites/psxtests/psx10/task.c @@ -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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_mutex_lock( &Mutex_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: pthread_cond_wait" ); status = pthread_cond_wait( &Cond1_id, &Mutex_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: back from pthread_cond_wait release mutex" ); status = pthread_mutex_unlock( &Mutex_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); /* wait for a condition variable broadcast from Init */ status = pthread_mutex_lock( &Mutex_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: pthread_cond_wait" ); status = pthread_cond_wait( &Cond1_id, &Mutex_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Task_1: back from pthread_cond_wait release mutex" ); status = pthread_mutex_unlock( &Mutex_id ); - rtems_test_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 dcf1847945..2427c51d0f 100644 --- a/testsuites/psxtests/psx10/task2.c +++ b/testsuites/psxtests/psx10/task2.c @@ -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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Task_2: pthread_cond_wait" ); status = pthread_cond_wait( &Cond1_id, &Mutex_id ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Task_2: back from pthread_cond_wait release mutex" ); status = pthread_mutex_unlock( &Mutex_id ); - rtems_test_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 f3493aeb16..8c50c855d9 100644 --- a/testsuites/psxtests/psx10/task3.c +++ b/testsuites/psxtests/psx10/task3.c @@ -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 ); - rtems_test_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 ); - rtems_test_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 088dcff40f..3fea79a3ea 100644 --- a/testsuites/psxtests/psx11/init.c +++ b/testsuites/psxtests/psx11/init.c @@ -52,7 +52,7 @@ void *POSIX_Init( priority_1 ); status = pthread_setschedparam( Init_id, SCHED_FIFO, ¶m ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: join with the other thread" ); status = pthread_join( Task_id, NULL ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: join with the other thread" ); status = pthread_join( Task_id, NULL ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: join with the other thread" ); status = pthread_join( Task_id, NULL ); - rtems_test_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 5dd8aa3924..b42d81f792 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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sched_rr_get_interval( getpid(), &delay ); - rtems_test_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 ); - rtems_test_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 d96b3cdb42..e57dd2937e 100644 --- a/testsuites/psxtests/psx12/init.c +++ b/testsuites/psxtests/psx12/init.c @@ -63,25 +63,25 @@ void *POSIX_Init( puts( "Init: pthread_attr_init - SUCCESSFUL" ); status = pthread_attr_init( &attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* replenish period < budget error */ puts( "Init: pthread_attr_init - SUCCESSFUL" ); status = pthread_attr_init( &attr ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: set scheduling parameter attributes for sporadic server" ); status = pthread_attr_setschedpolicy( &attr, SCHED_SPORADIC ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); schedparam.sched_ss_repl_period.tv_sec = 1; schedparam.sched_ss_repl_period.tv_nsec = 0; @@ -92,14 +92,14 @@ void *POSIX_Init( schedparam.sched_ss_low_priority = 100; status = pthread_attr_setschedparam( &attr, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_create - EINVAL (replenish < budget)" ); status = pthread_create( &Task_id, &attr, Task_1, NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* invalid sched_ss_low_priority error */ @@ -112,11 +112,11 @@ void *POSIX_Init( schedparam.sched_ss_low_priority = -1; status = pthread_attr_setschedparam( &attr, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_create - EINVAL (invalid sched_ss_low_priority)" ); status = pthread_create( &Task_id, &attr, Task_1, NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* create a thread as a sporadic server */ @@ -129,14 +129,14 @@ void *POSIX_Init( schedparam.sched_ss_low_priority = sched_get_priority_max( SCHED_FIFO ) - 6; status = pthread_attr_setschedparam( &attr, &schedparam ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: pthread_create - SUCCESSFUL" ); status = pthread_create( &Task_id, &attr, Task_1, NULL ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = pthread_join( Task_id, NULL ); - rtems_test_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 ada5f73866..23eb422a01 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 ); - rtems_test_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 ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); sc = sigaddset( &mask, SIGALRM ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); puts( "Init: Unblock SIGALRM" ); sc = sigprocmask( SIG_UNBLOCK, &mask, NULL ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 b359cdf32d..77b80ab613 100644 --- a/testsuites/psxtests/psxbarrier01/test.c +++ b/testsuites/psxtests/psxbarrier01/test.c @@ -33,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 ); - rtems_test_assert( (status == 0) || (status == PTHREAD_BARRIER_SERIAL_THREAD) ); + rtems_test_assert( (status == 0) || (status == PTHREAD_BARRIER_SERIAL_THREAD) ); return NULL; } @@ -65,155 +65,155 @@ int main( /*************** NULL POINTER CHECKS *****************/ puts( "pthread_barrierattr_init( NULL ) -- EINVAL" ); status = pthread_barrierattr_init( NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_setpshared( NULL, private ) -- EINVAL" ); status = pthread_barrierattr_setpshared( NULL, PTHREAD_PROCESS_PRIVATE ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_setpshared( NULL, shared ) -- EINVAL" ); status = pthread_barrierattr_setpshared( NULL, PTHREAD_PROCESS_SHARED ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_getpshared( NULL, &p ) -- EINVAL" ); status = pthread_barrierattr_getpshared( NULL, &p ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_destroy( NULL ) -- EINVAL" ); status = pthread_barrierattr_destroy( NULL ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_getpshared( &attr, NULL ) -- EINVAL" ); status = pthread_barrierattr_getpshared( &attr, NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_destroy( &attr ) -- EINVAL" ); status = pthread_barrierattr_destroy( &attr ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** ACTUALLY WORK THIS TIME *****************/ puts( "pthread_barrierattr_init( &attr ) -- OK" ); status = pthread_barrierattr_init( &attr ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_setpshared( &attr, private ) -- OK" ); status = pthread_barrierattr_setpshared( &attr, PTHREAD_PROCESS_PRIVATE ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_getpshared( &attr, &p ) -- OK" ); status = pthread_barrierattr_getpshared( &attr, &p ); - rtems_test_assert( status == 0 ); - rtems_test_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 ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_getpshared( &attr, &p ) -- OK" ); status = pthread_barrierattr_getpshared( &attr, &p ); - rtems_test_assert( status == 0 ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** DESTROY/REUSE CHECK *****************/ puts( "pthread_barrierattr_destroy( &attr ) -- OK" ); status = pthread_barrierattr_destroy( &attr ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_getpshared( &attr, &p ) destroyed -- EINVAL" ); status = pthread_barrierattr_getpshared( &attr, &p ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* zero count argument */ puts( "pthread_barrierattr_init( &attr ) -- OK" ); status = pthread_barrierattr_init( &attr ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrier_init( &barrier, &attr, 0 ) -- EINVAL" ); status = pthread_barrier_init( &barrier, &attr, 0 ); - rtems_test_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 ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrier_init( &barrier, NULL, 1 ) -- EAGAIN" ); status = pthread_barrier_init( &barrier, NULL, 1 ); - rtems_test_assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); /* clean up */ puts( "pthread_barrier_destroy( &barrier ) -- OK" ); status = pthread_barrier_destroy( &barrier ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_destroy( &attr ) -- OK" ); status = pthread_barrierattr_destroy( &attr ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrier_destroy( &bad_barrier ) -- EINVAL" ); status = pthread_barrier_destroy( &bad_barrier ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrier_wait( &bad_barrier ) -- EINVAL" ); status = pthread_barrier_wait( &bad_barrier ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** ACTUALLY CREATE ONE CHECK *****************/ puts( "pthread_barrierattr_init( &attr ) -- OK" ); status = pthread_barrierattr_init( &attr ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrier_init( &barrier, &attr, 2 ) -- OK" ); status = pthread_barrier_init( &barrier, &attr, 2 ); - rtems_test_assert( status == 0 ); - rtems_test_assert( barrier != 0 ); + rtems_test_assert( status == 0 ); + rtems_test_assert( barrier != 0 ); puts( "pthread_barrier_destroy( &barrier ) -- OK" ); status = pthread_barrier_destroy( &barrier ); - rtems_test_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 ); - rtems_test_assert( status == 0 ); - rtems_test_assert( barrier != 0 ); + rtems_test_assert( status == 0 ); + rtems_test_assert( barrier != 0 ); for (i=0 ; iname, tq->oflag, 0x777, &attr ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( open_mq[i] != (-1) ); - rtems_test_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 ); - rtems_test_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( - rtems_test_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 ); - rtems_test_assert( n_mq != (-1) ); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( waitset, SIGUSR1 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 */ - rtems_test_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 4d64aa53d5..b144ea7190 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" ); } - rtems_test_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" ); } - rtems_test_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 484c472707..b67b7a29e9 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" ); - rtems_test_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" ); - rtems_test_assert( second_Queue == (-1) ); - rtems_test_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" ); - rtems_test_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" ); - rtems_test_assert( sc == 0 ); + rtems_test_assert( sc == 0 ); sb = rtems_workspace_get_information( &start ); - rtems_test_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 ); - rtems_test_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" ); - rtems_test_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" ); - rtems_test_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/psxrwlock01/test.c b/testsuites/psxtests/psxrwlock01/test.c index af17da1abe..433d8b2e36 100644 --- a/testsuites/psxtests/psxrwlock01/test.c +++ b/testsuites/psxtests/psxrwlock01/test.c @@ -37,11 +37,11 @@ void *ReadLockThread(void *arg) puts( "ReadThread - pthread_rwlock_rdlock(RWLock) blocking -- OK" ); status = pthread_rwlock_rdlock(&RWLock); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "ReadThread - pthread_rwlock_rdlock(RWLock) unblocked -- OK" ); status = pthread_rwlock_unlock(&RWLock); - rtems_test_assert( !status ); + rtems_test_assert( !status ); return NULL; } @@ -54,14 +54,14 @@ void *WriteLockThread(void *arg) puts( "WriteThread - pthread_rwlock_wrlock(RWLock) blocking -- OK" ); status = pthread_rwlock_wrlock(&RWLock); - rtems_test_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); - rtems_test_assert( !status ); + rtems_test_assert( !status ); return NULL; } @@ -90,75 +90,75 @@ int main( /*************** NULL POINTER CHECKS *****************/ puts( "pthread_rwlockattr_init( NULL ) -- EINVAL" ); status = pthread_rwlockattr_init( NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_setpshared( NULL, private ) -- EINVAL" ); status = pthread_rwlockattr_setpshared( NULL, PTHREAD_PROCESS_PRIVATE ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_setpshared( NULL, shared ) -- EINVAL" ); status = pthread_rwlockattr_setpshared( NULL, PTHREAD_PROCESS_SHARED ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_getpshared( NULL, &p ) -- EINVAL" ); status = pthread_rwlockattr_getpshared( NULL, &p ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_destroy( NULL ) -- EINVAL" ); status = pthread_rwlockattr_destroy( NULL ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_getpshared( &attr, NULL ) -- EINVAL" ); status = pthread_rwlockattr_getpshared( &attr, NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlockattr_destroy( &attr ) -- EINVAL" ); status = pthread_rwlockattr_destroy( &attr ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** ACTUALLY WORK THIS TIME *****************/ puts( "pthread_rwlockattr_init( &attr ) -- OK" ); status = pthread_rwlockattr_init( &attr ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlockattr_setpshared( &attr, private ) -- OK" ); status = pthread_rwlockattr_setpshared( &attr, PTHREAD_PROCESS_PRIVATE ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlockattr_getpshared( &attr, &p ) -- OK" ); status = pthread_rwlockattr_getpshared( &attr, &p ); - rtems_test_assert( status == 0 ); - rtems_test_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 ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlockattr_getpshared( &attr, &p ) -- OK" ); status = pthread_rwlockattr_getpshared( &attr, &p ); - rtems_test_assert( status == 0 ); - rtems_test_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 ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlockattr_getpshared( &attr, &p ) destroyed -- EINVAL" ); status = pthread_rwlockattr_getpshared( &attr, &p ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** NULL ARGUMENT CHECKS *****************/ abstime.tv_sec = 0; @@ -166,87 +166,87 @@ int main( puts( "pthread_rwlock_init(NULL, &attr) -- EINVAL" ); status = pthread_rwlock_init(NULL, &attr); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_destroy(NULL) -- EINVAL" ); status = pthread_rwlock_destroy(NULL); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_rdlock(NULL) -- EINVAL" ); status = pthread_rwlock_rdlock(NULL); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedrdlock( NULL, &abstime) -- EINVAL" ); status = pthread_rwlock_timedrdlock( NULL, &abstime); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedrdlock( &rwlock, NULL) -- EINVAL" ); status = pthread_rwlock_timedrdlock( &rwlock, NULL); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_tryrdlock(NULL) -- EINVAL" ); status = pthread_rwlock_tryrdlock(NULL); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_wrlock(NULL) -- EINVAL" ); status = pthread_rwlock_wrlock(NULL); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedwrlock( NULL, &abstime) -- EINVAL" ); status = pthread_rwlock_timedwrlock( NULL, &abstime ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedwrlock( &rwlock, NULL) -- EINVAL" ); status = pthread_rwlock_timedwrlock( &rwlock, NULL); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_trywrlock(NULL) -- EINVAL" ); status = pthread_rwlock_trywrlock(NULL); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_unlock(NULL) -- EINVAL" ); status = pthread_rwlock_unlock(NULL); - rtems_test_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 ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); abstime.tv_sec += 5; puts( "pthread_rwlock_destroy(BadId) -- EINVAL" ); status = pthread_rwlock_destroy(&rwlock); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_rdlock(BadId) -- EINVAL" ); status = pthread_rwlock_rdlock(&rwlock); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedrdlock(BadId, &abstime) -- EINVAL" ); status = pthread_rwlock_timedrdlock( &rwlock, &abstime); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_tryrdlock(BadId) -- EINVAL" ); status = pthread_rwlock_tryrdlock(&rwlock); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_wrlock(BadId) -- EINVAL" ); status = pthread_rwlock_wrlock(&rwlock); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_timedwrlock(BadId, &abstime) -- EINVAL" ); status = pthread_rwlock_timedwrlock( &rwlock, &abstime ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_trywrlock(BadId) -- EINVAL" ); status = pthread_rwlock_trywrlock(&rwlock); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_rwlock_unlock(BadId) -- EINVAL" ); status = pthread_rwlock_unlock(&rwlock); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** BAD ABSTIME CHECK *****************/ @@ -263,66 +263,66 @@ int main( /*************** ACTUALLY CREATE ONE CHECK *****************/ puts( "pthread_rwlockattr_init( &attr ) -- OK" ); status = pthread_rwlockattr_init( &attr ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlock_init( &rwlock, &attr ) -- OK" ); status = pthread_rwlock_init( &rwlock, &attr ); - rtems_test_assert( status == 0 ); - rtems_test_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 ); - rtems_test_assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); puts( "pthread_rwlock_destroy( &rwlock ) -- OK" ); status = pthread_rwlock_destroy( &rwlock ); - rtems_test_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 ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlock_destroy( &rwlock ) -- OK" ); status = pthread_rwlock_destroy( &rwlock ); - rtems_test_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 ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_rwlock_tryrdlock(RWLock) -- OK" ); status = pthread_rwlock_tryrdlock(&RWLock); - rtems_test_assert( !status ); + rtems_test_assert( !status ); for (i=0 ; ipriority != -1 ; i++, test++ ) { printf( "Init - Create thread %d, priority=%d\n", i, test->priority ); sc = pthread_attr_init( &attr ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_attr_setschedpolicy( &attr, SCHED_RR ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); param.sched_priority = test->priority; sc = pthread_attr_setschedparam( &attr, ¶m ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_create( &id, &attr, Test_Thread, test ); - rtems_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 ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); } puts( "Init - sending SIGUSR1" ); sc = kill( getpid(), SIGUSR1 ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); /* we are just scheduling the signal, not delivering it */ - rtems_test_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 bf6042ba9a..c1916f1adb 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 ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); printf( "%s - Unblock %s\n", name, signal_name(SIGNAL_ONE) ); sc = sigaddset( &mask, SIGNAL_ONE ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); if ( !blocked ) { printf( "%s - Unblock %s\n", name, signal_name(SIGNAL_TWO) ); sc = sigaddset( &mask, SIGNAL_TWO ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); } /* unblocked signals */ sc = pthread_sigmask( SIG_UNBLOCK, &mask, NULL ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); /* build wait mask */ sc = sigemptyset( &wait_mask ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); sc = sigaddset( &wait_mask, SIGNAL_ONE ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( info.si_signo == SIGNAL_TWO ); - rtems_test_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 ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_create( &id, NULL, Test_Thread, &trueArg ); - rtems_test_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 ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - sleep - SignalBlocked thread settle - OK" ); sc = nanosleep( &delay_request, NULL ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); printf( "Init - sending %s - deliver to one thread\n", signal_name(SIGNAL_TWO)); sc = SEND_SIGNAL( SIGNAL_TWO ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); printf( "Init - sending %s - deliver to other thread\n", signal_name(SIGNAL_TWO)); sc = SEND_SIGNAL( SIGNAL_TWO ); - rtems_test_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 ); - rtems_test_assert( sc == -1 ); - rtems_test_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 */ - rtems_test_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 5324c0799d..dee4c1cc04 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 */ ); - rtems_test_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 15690a80ad..8fe37b95b4 100644 --- a/testsuites/psxtests/psxspin01/test.c +++ b/testsuites/psxtests/psxspin01/test.c @@ -34,7 +34,7 @@ rtems_task SpinlockThread(rtems_task_argument arg) } puts( "pthread_spin_lock( &Spinlock ) from Thread -- OK" ); status = pthread_spin_lock( &Spinlock ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "sleep to allow main thread to run" ); sleep( 1 ); @@ -46,7 +46,7 @@ rtems_task SpinlockThread(rtems_task_argument arg) puts( "pthread_spin_unlock( &Spinlock ) from Thread -- OK" ); status = pthread_spin_unlock( &Spinlock ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); rtems_task_delete( RTEMS_SELF ); } @@ -73,96 +73,96 @@ int main( puts( "pthread_spin_init( NULL, PTHREAD_PROCESS_PRIVATE ) -- EINVAL" ); status = pthread_spin_init( NULL, PTHREAD_PROCESS_PRIVATE ); - rtems_test_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 ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_init( &spinlock, 0x1234 ) -- EINVAL" ); status = pthread_spin_init( &spinlock, 0x1234 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_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 ); - rtems_test_assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); puts( "pthread_spin_lock( NULL ) -- EINVAL" ); status = pthread_spin_lock( NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_trylock( NULL ) -- EINVAL" ); status = pthread_spin_trylock( NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_unlock( NULL ) -- EINVAL" ); status = pthread_spin_unlock( NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_destroy( NULL ) -- EINVAL" ); status = pthread_spin_destroy( NULL ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); spinlock = 0; puts( "pthread_spin_lock( &spinlock ) -- EINVAL" ); status = pthread_spin_lock( &spinlock ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_trylock( &spinlock ) -- EINVAL" ); status = pthread_spin_trylock( &spinlock ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_unlock( &spinlock ) -- EINVAL" ); status = pthread_spin_unlock( &spinlock ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_destroy( &spinlock ) -- EINVAL" ); status = pthread_spin_destroy( &spinlock ); - rtems_test_assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_spin_unlock( &Spinlock ) -- already unlocked OK" ); status = pthread_spin_unlock( &Spinlock ); - rtems_test_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 ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_spin_lock( &Spinlock ) -- EDEADLK" ); status = pthread_spin_lock( &Spinlock ); - rtems_test_assert( status == EDEADLK ); + rtems_test_assert( status == EDEADLK ); puts( "pthread_spin_trylock( &Spinlock ) -- EDEADLK" ); status = pthread_spin_trylock( &Spinlock ); - rtems_test_assert( status == EDEADLK ); + rtems_test_assert( status == EDEADLK ); puts( "pthread_spin_unlock( &Spinlock ) -- OK" ); status = pthread_spin_unlock( &Spinlock ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); /* Try lock/unlock pair */ puts( "pthread_spin_trylock( &Spinlock ) -- OK" ); status = pthread_spin_trylock( &Spinlock ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_spin_unlock( &Spinlock ) -- OK" ); status = pthread_spin_unlock( &Spinlock ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); /* Let another thread lock a spinlock and we contend with it */ @@ -177,10 +177,10 @@ int main( RTEMS_DEFAULT_ATTRIBUTES, &taskid ); - rtems_test_assert( rstatus == RTEMS_SUCCESSFUL ); + rtems_test_assert( rstatus == RTEMS_SUCCESSFUL ); rstatus = rtems_task_start( taskid, SpinlockThread, 0 ); - rtems_test_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 +190,7 @@ int main( mainThreadSpinning = 1; puts( "pthread_spin_lock( &Spinlock ) -- OK" ); status = pthread_spin_lock( &Spinlock ); - rtems_test_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 +200,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 ); - rtems_test_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 ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_spin_destroy( &Spinlock ) -- OK" ); status = pthread_spin_destroy( &Spinlock ); - rtems_test_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 4d99526072..4ca085e95e 100644 --- a/testsuites/psxtests/psxspin02/test.c +++ b/testsuites/psxtests/psxspin02/test.c @@ -28,11 +28,11 @@ rtems_task SpinlockThread(rtems_task_argument arg) puts( "pthread_spin_trylock( &Spinlock ) -- EBUSY" ); status = pthread_spin_trylock( &Spinlock ); - rtems_test_assert( status == EBUSY ); + rtems_test_assert( status == EBUSY ); puts( "pthread_spin_unlock( &Spinlock ) -- EPERM" ); status = pthread_spin_unlock( &Spinlock ); - rtems_test_assert( status == EPERM ); + rtems_test_assert( status == EPERM ); rtems_task_delete( RTEMS_SELF ); } @@ -59,12 +59,12 @@ int main( /* This successfully creates one */ puts( "pthread_spin_init( &Spinlock, PTHREAD_PROCESS_PRIVATE ) -- OK" ); status = pthread_spin_init( &Spinlock, PTHREAD_PROCESS_PRIVATE ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); /* Lock it */ puts( "pthread_spin_lock( &Spinlock ) -- OK" ); status = pthread_spin_lock( &Spinlock ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); /* Create a helper task */ rstatus = rtems_task_create( @@ -75,20 +75,20 @@ int main( RTEMS_DEFAULT_ATTRIBUTES, &taskid ); - rtems_test_assert( rstatus == RTEMS_SUCCESSFUL ); + rtems_test_assert( rstatus == RTEMS_SUCCESSFUL ); rstatus = rtems_task_start( taskid, SpinlockThread, 0 ); - rtems_test_assert( rstatus == RTEMS_SUCCESSFUL ); + rtems_test_assert( rstatus == RTEMS_SUCCESSFUL ); sleep(1); puts( "pthread_spin_unlock( &Spinlock ) -- OK" ); status = pthread_spin_unlock( &Spinlock ); - rtems_test_assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_spin_destroy( &Spinlock ) -- OK" ); status = pthread_spin_destroy( &Spinlock ); - rtems_test_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 122d8764e9..4c66328b60 100644 --- a/testsuites/psxtests/psxstack01/init.c +++ b/testsuites/psxtests/psxstack01/init.c @@ -60,23 +60,23 @@ void *POSIX_Init( puts( "Init - Initialize thread attribute for user provided stack" ); sc = pthread_attr_init( &attr ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_attr_setstackaddr( &attr, Stack_Low ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_attr_setstacksize( &attr, PTHREAD_MINIMUM_STACK_SIZE ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); /* create threads */ sc = pthread_create( &id, &attr, Test_Thread, NULL ); - rtems_test_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 ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); puts( "*** END OF POSIX STACK ATTRIBUTE TEST 01 ***" ); rtems_test_exit(0); diff --git a/testsuites/psxtests/psxstack02/init.c b/testsuites/psxtests/psxstack02/init.c index a0f2173d74..c393e6a9e4 100644 --- a/testsuites/psxtests/psxstack02/init.c +++ b/testsuites/psxtests/psxstack02/init.c @@ -63,14 +63,14 @@ void *POSIX_Init( puts( "Init - Initialize thread attribute for user provided stack" ); sc = pthread_attr_init( &attr ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); sc = pthread_attr_setstack( &attr, Stack_Low, PTHREAD_MINIMUM_STACK_SIZE ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); /* create threads */ sc = pthread_create( &id, &attr, Test_Thread, NULL ); - rtems_test_assert( !sc ); + rtems_test_assert( !sc ); puts( "Init - let other thread run" ); delay_request.tv_sec = 0; diff --git a/testsuites/psxtests/psxualarm/init.c b/testsuites/psxtests/psxualarm/init.c index 82a4d8d251..4277a90bbb 100644 --- a/testsuites/psxtests/psxualarm/init.c +++ b/testsuites/psxtests/psxualarm/init.c @@ -79,12 +79,12 @@ void *POSIX_Init( /* unblock Signal and see if it happened */ status = sigemptyset( &mask ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sigaddset( &mask, SIGALRM ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); puts( "Init: Unblock SIGALRM" ); status = sigprocmask( SIG_UNBLOCK, &mask, NULL ); - rtems_test_assert( !status ); + rtems_test_assert( !status ); status = sleep(10); /* stop ularm */ -- cgit v1.2.3