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/psxmsgq04/init.c b/testsuites/psxtests/psxmsgq04/init.c
index 599a3f213f..484c472707 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" );
-  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" );
-  assert( second_Queue == (-1) );
-  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" );
-  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" );
-  assert( sc == 0 );
+  rtems_test_assert(  sc == 0 );
 
   sb = rtems_workspace_get_information( &start );
-  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 );
-    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" );
-    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" );
-    assert( sc == 0 );
+    rtems_test_assert(  sc == 0 );
 
   puts( "*** END OF POSIX MESSAGE QUEUE TEST 4 ***" );
   rtems_test_exit( 0 );