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.

1 files changed, 17 insertions, 17 deletions

diff --git a/testsuites/psxtests/psx09/init.c b/testsuites/psxtests/psx09/init.c
index bb47925221..ca4c5c99ee 100644
--- a/testsuites/psxtests/psx09/init.c
+++ b/testsuites/psxtests/psx09/init.c
@@ -72,7 +72,7 @@ void *POSIX_Init(
 
   puts( "Init: pthread_getschedparam - SUCCESSFUL" );
   status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   priority = schedparam.sched_priority;
   sprintf( buffer, " - current priority = %d", priority );
@@ -88,10 +88,10 @@ void *POSIX_Init(
 
   puts( "Init: pthread_setschedparam - SUCCESSFUL (sporadic server)" );
   status = pthread_setschedparam( pthread_self(), SCHED_SPORADIC, &schedparam );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   priority = schedparam.sched_priority;
   sprintf( buffer, " - new priority = %d", priority );
@@ -101,7 +101,7 @@ void *POSIX_Init(
 
   for ( passes=0 ; passes <= 3 ; ) {
     status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-    assert( !status );
+    rtems_test_assert(  !status );
 
     if ( priority != schedparam.sched_priority ) {
       priority = schedparam.sched_priority;
@@ -116,7 +116,7 @@ void *POSIX_Init(
   empty_line();
 
   status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   schedparam.ss_replenish_period.tv_sec = 0;
   schedparam.ss_replenish_period.tv_nsec = 500000000;  /* 1/2 second */
@@ -132,23 +132,23 @@ void *POSIX_Init(
 
   puts( "Init: pthread_setschedparam - SUCCESSFUL (sporadic server)" );
   status = pthread_setschedparam( pthread_self(), SCHED_SPORADIC, &schedparam );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Initializing mutex attributes for priority ceiling" );
   status = pthread_mutexattr_init( &attr );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: Creating a mutex" );
   status = pthread_mutex_init( &Mutex_id, &attr );
   if ( status )
     printf( "status = %d\n", status );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   priority = schedparam.sched_priority;
   sprintf( buffer, " - new priority = %d", priority );
@@ -162,11 +162,11 @@ void *POSIX_Init(
   status = pthread_mutex_lock( &Mutex_id );
   if ( status )
     printf( "status = %d %s\n", status, strerror(status) );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   for ( ; ; ) {
     status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-    assert( !status );
+    rtems_test_assert(  !status );
 
     if ( schedparam.sched_priority == LOW_PRIORITY ) {
       puts( "ERROR - Init's priority lowered while holding mutex" );
@@ -182,7 +182,7 @@ void *POSIX_Init(
     print_current_time( "Init: ", buffer );
 
     status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-    assert( !status );
+    rtems_test_assert(  !status );
 
     priority = schedparam.sched_priority;
     sprintf( buffer, " - new priority = %d", priority );
@@ -197,10 +197,10 @@ void *POSIX_Init(
   status = pthread_mutex_unlock( &Mutex_id );
   if ( status )
     printf( "status = %d\n", status );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   priority = schedparam.sched_priority;
   sprintf( buffer, " - new priority = %d", priority );
@@ -208,14 +208,14 @@ void *POSIX_Init(
 
   for ( ; ; ) {
     status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-    assert( !status );
+    rtems_test_assert(  !status );
 
     if ( schedparam.sched_priority == LOW_PRIORITY )
       break;
   }
 
   status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   priority = schedparam.sched_priority;
   sprintf( buffer, " - new priority = %d", priority );