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.

2 files changed, 17 insertions, 17 deletions

diff --git a/testsuites/psxtests/psx11/init.c b/testsuites/psxtests/psx11/init.c
index 136647a27f..088dcff40f 100644
--- a/testsuites/psxtests/psx11/init.c
+++ b/testsuites/psxtests/psx11/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2008.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -52,7 +52,7 @@ void *POSIX_Init(
     priority_1
   );
   status = pthread_setschedparam( Init_id, SCHED_FIFO, &param );
-  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, &param );
-  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, &param );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* create a thread as SCHED_FIFO */
 
   printf(
     "Init: create a thread of SCHED_FIFO with priority %d\n", priority_4 );
   status = pthread_attr_init( &attr );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   attr.schedpolicy = SCHED_FIFO;
   attr.schedparam.sched_priority = priority_4;
 
   status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: join with the other thread" );
   status = pthread_join( Task_id, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* create a thread as SCHED_RR */
 
   printf( "Init: create a thread of SCHED_RR with priority %d\n", priority_4 );
   status = pthread_attr_init( &attr );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED );
-  assert( !status );
+  rtems_test_assert(  !status );
   attr.schedpolicy = SCHED_RR;
   attr.schedparam.sched_priority = priority_4;
 
   status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: join with the other thread" );
   status = pthread_join( Task_id, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* create a thread as SCHED_OTHER */
 
   printf(
     "Init: create a thread of SCHED_OTHER with priority %d\n", priority_4 );
   status = pthread_attr_init( &attr );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   attr.schedpolicy = SCHED_OTHER;
   attr.schedparam.sched_priority = priority_4;
 
   status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: join with the other thread" );
   status = pthread_join( Task_id, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "*** END OF POSIX TEST 11 ***" );
   rtems_test_exit( 0 );
diff --git a/testsuites/psxtests/psx11/task.c b/testsuites/psxtests/psx11/task.c
index ac35cc6c76..5dd8aa3924 100644
--- a/testsuites/psxtests/psx11/task.c
+++ b/testsuites/psxtests/psx11/task.c
@@ -50,10 +50,10 @@ void *Task_1(
   struct timespec delay;
 
   status = clock_gettime( CLOCK_REALTIME, &start );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = sched_rr_get_interval( getpid(), &delay );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* double the rr interval for confidence */
 
@@ -69,7 +69,7 @@ void *Task_1(
   for ( ; ; ) {
 
     status = clock_gettime( CLOCK_REALTIME, &current );
-    assert( !status );
+    rtems_test_assert(  !status );
 
     diff_timespec( &start, &current, &difference );