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, 9 insertions, 9 deletions

diff --git a/testsuites/psxtests/psx01/task.c b/testsuites/psxtests/psx01/task.c
index 5943295411..052f4e82a6 100644
--- a/testsuites/psxtests/psx01/task.c
+++ b/testsuites/psxtests/psx01/task.c
@@ -37,7 +37,7 @@ void *Task_1_through_3(
 
   puts( "Task_1: sched_yield to Init" );
   status = sched_yield();
-  assert( !status );
+  rtems_test_assert( !status );
 
     /* switch to Task_1 */
 
@@ -55,38 +55,38 @@ void *Task_1_through_3(
   status = pthread_equal( Task_id, Task_id );
   if ( status )
     puts( "Task_1: pthread_equal - match case passed" );
-  assert( status );
+  rtems_test_assert( status );
 
   status = pthread_equal( Init_id, Task_id );
   if ( !status )
     puts( "Task_1: pthread_equal - different case passed" );
-  assert( !status );
+  rtems_test_assert( !status );
 
   puts( "Task_1: pthread_equal - first id bad" );
   status = pthread_equal( (pthread_t) -1, Task_id );
-  assert( !status );
+  rtems_test_assert( !status );
 
   puts( "Task_1: pthread_equal - second id bad" );
   status = pthread_equal( Init_id, (pthread_t) -1 );
-  assert( !status );
+  rtems_test_assert( !status );
 
   /* exercise pthread_once */
 
   puts( "Task_1: pthread_once - EINVAL (NULL once_control)" );
   status = pthread_once( NULL, Test_init_routine );
-  assert( status == EINVAL );
+  rtems_test_assert( status == EINVAL );
 
   puts( "Task_1: pthread_once - EINVAL (NULL init_routine)" );
   status = pthread_once( &once, NULL );
-  assert( status == EINVAL );
+  rtems_test_assert( status == EINVAL );
 
   puts( "Task_1: pthread_once - SUCCESSFUL (init_routine executes)" );
   status = pthread_once( &once, Test_init_routine );
-  assert( !status );
+  rtems_test_assert( !status );
 
   puts( "Task_1: pthread_once - SUCCESSFUL (init_routine does not execute)" );
   status = pthread_once( &once, Test_init_routine );
-  assert( !status );
+  rtems_test_assert( !status );
 
   puts( "*** END OF POSIX TEST 1 ***" );
   rtems_test_exit( 0 );