2009-12-08 Joel Sherrill <joel.sherrill@oarcorp.com>

	* include/pmacros.h, psx01/task.c, psx02/init.c, psx02/task.c,
	psx03/init.c, psx03/task.c, psx04/init.c, psx04/task1.c,
	psx04/task2.c, psx04/task3.c, psx05/init.c, psx05/task.c,
	psx05/task2.c, psx05/task3.c, psx06/init.c, psx06/task.c,
	psx06/task2.c, psx07/init.c, psx08/init.c, psx08/task2.c,
	psx08/task3.c, psx09/init.c, psx10/init.c, psx10/task.c,
	psx10/task2.c, psx10/task3.c, psx11/init.c, psx11/task.c,
	psx12/init.c, psxalarm01/init.c, psxbarrier01/test.c,
	psxcancel01/init.c, psxchroot01/test.c, psxclock/init.c,
	psxfile01/test.c, psxfile01/test_cat.c, psxfile01/test_extend.c,
	psxfile01/test_write.c, psxitimer/init.c, psxkey01/task.c,
	psxkey02/init.c, psxkey03/init.c, psxmount/test.c, psxmsgq01/init.c,
	psxmsgq03/init.c, psxmsgq04/init.c, psxreaddir/test.c,
	psxrwlock01/test.c, psxsem01/init.c, psxsignal01/init.c,
	psxsignal01/task1.c, psxsignal02/init.c, psxsignal03/init.c,
	psxsignal05/init.c, psxspin01/test.c, psxspin02/test.c,
	psxstack01/init.c, psxstat/test.c, psxtime/test.c, psxualarm/init.c:
	Use rtems_test_assert() consistently instead of system assert().
	rtems_test_assert() is designed to integrate into the RTEMS test
	suite infrastructure.

4 files changed, 101 insertions, 101 deletions

diff --git a/testsuites/psxtests/psx04/init.c b/testsuites/psxtests/psx04/init.c
index 93719127d4..e9311b9e16 100644
--- a/testsuites/psxtests/psx04/init.c
+++ b/testsuites/psxtests/psx04/init.c
@@ -85,44 +85,44 @@ void *POSIX_Init(
   status = sigwait( NULL, NULL );
   if ( status != EINVAL )
     printf( "status = %d (%s)\n", status, strerror(status) );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: sigwait - EINVAL (NULL set)" );
 
   status = sigtimedwait( NULL, NULL, NULL );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigwait - EINVAL (NULL set)" );
 
 /* install a signal handler for SIGUSR1 */
 
   status = sigemptyset( &act.sa_mask );
-  assert( !status );
+  rtems_test_assert(  !status );
   printf( "Init: sigemptyset -  set= 0x%08x\n", (unsigned int) act.sa_mask );
 
   /* test sigfillset following the above sigemptyset */
 
   status = sigfillset( &act.sa_mask );
-  assert( !status );
+  rtems_test_assert(  !status );
   printf( "Init: sigfillset -  set= 0x%08x\n", (unsigned int) act.sa_mask );
 
   /* test sigdelset */
 
   status = sigdelset( &act.sa_mask, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
   printf( "Init: sigdelset - delete SIGUSR1 set= 0x%08x\n",
       (unsigned int) act.sa_mask );
 
   /* test sigismember - FALSE */
 
   status = sigismember( &act.sa_mask, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
   puts( "Init: sigismember - FALSE since SIGUSR1 is not a member" );
 
   /* test sigismember - TRUE */
 
   status = sigismember( &act.sa_mask, SIGUSR2 );
-  assert( status );
+  rtems_test_assert(  status );
   puts( "Init: sigismember - TRUE since SIGUSR2 is a member" );
 
   /* return the set to empty */
@@ -139,7 +139,7 @@ void *POSIX_Init(
 
   puts( "Init: send SIGUSR1 to process" );
   status = kill( getpid(), SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* end of install a signal handler for SIGUSR1 */
 
@@ -150,10 +150,10 @@ void *POSIX_Init(
   empty_line();
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Block SIGUSR1" );
   act.sa_handler = Signal_handler;
@@ -168,7 +168,7 @@ void *POSIX_Init(
 
   puts( "Init: send SIGUSR1 to process" );
   status = kill( getpid(), SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   Signal_occurred = 0;
 
@@ -177,30 +177,30 @@ void *POSIX_Init(
   empty_line();
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Block SIGUSR1" );
   status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigpending( &pending_set );
-  assert( !status );
+  rtems_test_assert(  !status );
   printf( "Init: Signals pending 0x%08x\n", (unsigned int) pending_set );
 
   puts( "Init: send SIGUSR1 to process" );
   status = kill( getpid(), SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigpending( &pending_set );
-  assert( !status );
+  rtems_test_assert(  !status );
   printf( "Init: Signals pending 0x%08x\n", (unsigned int) pending_set );
 
   puts( "Init: Unblock SIGUSR1" );
   status = sigprocmask( SIG_UNBLOCK, &mask, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* now let another task get interrupted by a signal */
 
@@ -208,33 +208,33 @@ void *POSIX_Init(
 
   puts( "Init: create a thread interested in SIGUSR1" );
   status = pthread_create( &Task1_id, NULL, Task_1, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Block SIGUSR1" );
   status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigpending( &pending_set );
-  assert( !status );
+  rtems_test_assert(  !status );
   printf( "Init: Signals pending 0x%08x\n", (unsigned int) pending_set );
 
   puts( "Init: sleep so the other task can block" );
   remaining = sleep( 1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
      /* switch to task 1 */
 
   puts( "Init: send SIGUSR1 to process" );
   status = kill( getpid(), SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigpending( &pending_set );
-  assert( !status );
+  rtems_test_assert(  !status );
   printf( "Init: Signals pending 0x%08x\n", (unsigned int) pending_set );
 
   puts( "Init: sleep so the other task can catch signal" );
   remaining = sleep( 1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
      /* switch to task 1 */
 
@@ -245,7 +245,7 @@ void *POSIX_Init(
   /* install a signal handler for SIGALRM and unblock it */
 
   status = sigemptyset( &act.sa_mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   act.sa_handler = Signal_handler;
   act.sa_flags   = 0;
@@ -253,65 +253,65 @@ void *POSIX_Init(
   sigaction( SIGALRM, &act, NULL );
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGALRM );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Unblock SIGALRM" );
   status = sigprocmask( SIG_UNBLOCK, &mask, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* schedule the alarm */
 
   puts( "Init: Firing alarm in 5 seconds" );
   remaining = alarm( 5 );
   printf( "Init: %d seconds left on previous alarm\n", status );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Firing alarm in 2 seconds" );
   remaining = alarm( 2 );
   printf( "Init: %d seconds left on previous alarm\n", remaining );
-  assert( remaining == 5 );
+  rtems_test_assert(  remaining == 5 );
 
   puts( "Init: Wait 4 seconds for alarm" );
   remaining = sleep( 4 );
   printf( "Init: %d seconds left in sleep\n", remaining );
-  assert( remaining == 2 );
+  rtems_test_assert(  remaining == 2 );
 
   /* test SIG_SETMASK case and returning oset of pthread_sigmask */
 
   empty_line();
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGUSR2 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Block SIGUSR1 and SIGUSR2 only" );
   status = pthread_sigmask( SIG_SETMASK, &mask, &oset );
   printf( "Init: Previous blocked set was 0x%08x\n", (unsigned int) oset );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* test inquiry about current blocked set with pthread_sigmask */
 
   status = pthread_sigmask( 0, NULL, &oset );
   printf( "Init: Current blocked set is 0x%08x\n", (unsigned int) oset );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* return blocked mask to no signals blocked */
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Unblock all signals" );
   status = pthread_sigmask( SIG_SETMASK, &mask, &oset );
   printf( "Init: Previous blocked set was 0x%08x\n", (unsigned int) oset );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* test sigsuspend */
 
@@ -319,14 +319,14 @@ void *POSIX_Init(
 
   puts( "Init: create a thread to send Init SIGUSR1" );
   status = pthread_create( &Task2_id, NULL, Task_2, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: sigsuspend for any signal" );
   status = sigsuspend( &mask );
-  assert( status );
+  rtems_test_assert(  status );
   printf( "Init: awakended from sigsuspend status=%08d \n", status );
 
   /* test a SIGINFO case, these are signals sent to a process only */
@@ -335,7 +335,7 @@ void *POSIX_Init(
 
   puts( "Init: create a thread to sent Process SIGUSR1 with SA_SIGINFO" );
   status = pthread_create( &Task3_id, NULL, Task_3, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* set action on SIGUSR1 to an info case */
   act.sa_handler   = Signal_handler;
@@ -346,7 +346,7 @@ void *POSIX_Init(
 
   puts( "Init: sleep so the Task_3 can sigqueue SIGUSR1" );
   remaining = sleep( 1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
      /* switch to task 1 */
 
@@ -355,68 +355,68 @@ void *POSIX_Init(
   /* Send SIGUSR1, Task_3 has issued a sigwaitinfo */
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Block SIGUSR1" );
   status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: send SIGUSR1 to process" );
   status = kill( getpid(), SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: sleep so the Task_3 can receive SIGUSR1" );
   remaining = sleep( 1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* Send SIGUSR1, Task_3 has issued a sigwait */
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Block SIGUSR1" );
   status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: send SIGUSR1 to process" );
   status = kill( getpid(), SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: sleep so the Task_3 can receive SIGUSR1" );
   remaining = sleep( 1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* Send SIGUSR1, Task_3 has issued a sigwaitinfo */
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGUSR2 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Block SIGUSR2" );
   status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: send SIGUSR2 to process" );
   status = kill( getpid(), SIGUSR2 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: sleep so the Task_3 can receive SIGUSR2" );
   remaining = sleep( 1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* Suspend for signal that has already be sent */
 
   puts( "Init: sigsuspend for any signal" );
   status = sigsuspend( &mask );
-  assert( status );
+  rtems_test_assert(  status );
   printf( "Init: awakended from sigsuspend status=%d \n", status );
 
   /* generate error cases for psignal */
@@ -426,156 +426,156 @@ void *POSIX_Init(
   status = sigemptyset( NULL );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigemptyset - EINVAL (set invalid)" );
 
   status = sigfillset( NULL );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigfillset - EINVAL (set invalid)" );
 
   status = sigaddset( NULL, SIGUSR1 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigaddset - EINVAL (set invalid)" );
 
   status = sigaddset( &mask, 0 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigaddset - EINVAL (signal = 0)" );
 
   status = sigaddset( &mask, 999 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigaddset - EINVAL (set invalid)" );
 
   status = sigdelset( NULL, SIGUSR1 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigdelset - EINVAL (set invalid)" );
 
   status = sigdelset( &mask, 0 );
-  assert( !status );
+  rtems_test_assert(  !status );
   puts( "Init: sigdelset - SUCCESSFUL (signal = 0)" );
 
   status = sigdelset( &mask, 999 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigdelset - EINVAL (set invalid)" );
 
   status = sigismember( NULL, SIGUSR1 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigismember - EINVAL (set invalid)" );
 
   status = sigismember( &mask, 0 );
-  assert( !status );
+  rtems_test_assert(  !status );
   puts( "Init: sigismember - SUCCESSFUL (signal = 0)" );
 
   status = sigismember( &mask, 999 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigismember - EINVAL (signal invalid)" );
 
   status = sigaction( 0, &act, 0 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigaction - EINVAL (signal = 0)" );
 
   status = sigaction( 999, &act, NULL );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigaction - EINVAL (signal invalid)" );
 
   status = sigaction( SIGKILL, &act, NULL );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigaction - EINVAL (SIGKILL)" );
 
   status = pthread_sigmask( SIG_BLOCK, NULL, NULL );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: pthread_sigmask - EINVAL (set and oset invalid)" );
 
   status = pthread_sigmask( 999, &pending_set, NULL );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: pthread_sigmask - EINVAL (how invalid)" );
 
   status = sigpending( NULL );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: sigpending - EINVAL (set invalid)" );
 
   timeout.tv_nsec = -1;
   status = sigtimedwait( &mask, &info, &timeout );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: pthread_sigmask - EINVAL (timout->nsec invalid < 0)" );
 
   timeout.tv_nsec = 0x7fffffff;
   status = sigtimedwait( &mask, &info, &timeout );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: pthread_sigmask - EINVAL (timout->nsec invalid to large)" );
 
   status = pthread_kill( Init_id, 999 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: pthread_kill - EINVAL (sig invalid)" );
 
   status = pthread_kill( 0, SIGUSR2 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == ESRCH );
+  rtems_test_assert(  errno == ESRCH );
   puts( "Init: pthread_kill - ESRCH (signal SA_SIGINFO)" );
 
   status = pthread_kill( Init_id, 0 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: pthread_kill - EINVAL (signal = 0)" );
 
   act.sa_handler = SIG_IGN;
   act.sa_flags = 0;
   sigaction( SIGUSR2, &act, NULL );
   status = pthread_kill( Init_id, SIGUSR2 );
-  assert( !status );
+  rtems_test_assert(  !status );
   puts( "Init: pthread_kill - SUCCESSFUL (signal = SIG_IGN)" );
 
   status = kill( INT_MAX, SIGUSR1 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == ESRCH );
+  rtems_test_assert(  errno == ESRCH );
   puts( "Init: kill - ESRCH (pid invalid)" );
 
   status = kill( getpid(), 0 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: kill - EINVAL (signal = 0)" );
 
   status = kill( getpid(), 999 );
   if ( status != -1 )
     printf( "status = %d\n", status );
-  assert( errno == EINVAL );
+  rtems_test_assert(  errno == EINVAL );
   puts( "Init: kill - EINVAL (sig invalid)" );
 
   /* exit this thread */
diff --git a/testsuites/psxtests/psx04/task1.c b/testsuites/psxtests/psx04/task1.c
index 046ece1476..53d5dc877d 100644
--- a/testsuites/psxtests/psx04/task1.c
+++ b/testsuites/psxtests/psx04/task1.c
@@ -30,7 +30,7 @@ void *Task_1(
 
   seconds = sleep( 5 );
   printf( "Task_1: %d seconds left\n", seconds );
-  assert( seconds );
+  rtems_test_assert(  seconds );
 
      /* switch to Init */
 
diff --git a/testsuites/psxtests/psx04/task2.c b/testsuites/psxtests/psx04/task2.c
index 82291b804a..38af348d48 100644
--- a/testsuites/psxtests/psx04/task2.c
+++ b/testsuites/psxtests/psx04/task2.c
@@ -7,7 +7,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -28,7 +28,7 @@ void *Task_2(
 
   printf( "Task_2: sending SIGUSR1\n" );
   status = pthread_kill( Init_id, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
      /* switch to Init */
 
diff --git a/testsuites/psxtests/psx04/task3.c b/testsuites/psxtests/psx04/task3.c
index da4fb44e53..c411f39a6d 100644
--- a/testsuites/psxtests/psx04/task3.c
+++ b/testsuites/psxtests/psx04/task3.c
@@ -35,24 +35,24 @@ void *Task_3(
 
   printf( "Task_3: sigqueue SIGUSR1 with value= %d\n", value.sival_int );
   status = sigqueue( getpid(), SIGUSR1, value );
-  assert( !status );
+  rtems_test_assert(  !status );
 
      /* catch signal with sigwaitinfo */
 
   empty_line();
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   printf( "Task_3: sigwaitinfo SIGUSR1 with value= %d\n", value.sival_int );
   status = sigwaitinfo( &mask, &info );
 
      /* switch to Init */
 
-  assert( !(status==-1) );
+  rtems_test_assert(  !(status==-1) );
   printf(
     "Task_3: si_signo= %d si_code= %d value= %d\n",
     info.si_signo,
@@ -65,17 +65,17 @@ void *Task_3(
   empty_line();
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   printf( "Task_3: sigwait SIGUSR1\n" );
   status = sigwait( &mask, &sig );
 
      /* switch to Init */
 
-  assert( !status );
+  rtems_test_assert(  !status );
   printf( "Task_3: signo= %d\n", sig );
 
      /* catch signal with pause */
@@ -83,17 +83,17 @@ void *Task_3(
   empty_line();
 
   status = sigemptyset( &mask );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   printf( "Task_3: pause\n" );
   status = pause( );
 
      /* switch to Init */
 
-  assert( !(status==-1) );
+  rtems_test_assert(  !(status==-1) );
   printf( "Task_3: pause= %d\n", status );
 
 
@@ -103,11 +103,11 @@ void *Task_3(
 
   printf( "Task_3: sending SIGUSR2\n" );
   status = pthread_kill( Init_id, SIGUSR2 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   printf( "Task_3: sleep so the Init task can reguest a signal\n" );
   remaining = sleep( 1 );
-  assert( !status );
+  rtems_test_assert(  !status );
 
      /* end of task 3 */
   printf( "Task_3: exit\n" );