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

diff --git a/testsuites/psxtests/psxkey02/init.c b/testsuites/psxtests/psxkey02/init.c
index 246e1d18f2..df975a0ffd 100644
--- a/testsuites/psxtests/psxkey02/init.c
+++ b/testsuites/psxtests/psxkey02/init.c
@@ -30,13 +30,13 @@ void *POSIX_Init(
 
   puts( "Init - rtems_workspace_get_information - OK" );
   sb = rtems_workspace_get_information( &start );
-  assert( sb );
+  rtems_test_assert(  sb );
 
   #if 0
     printf( "Init - workspace free = %d\n", start.Free.largest );
     printf( "Init - workspace free blocks = %d\n", start.Free.number );
   #endif
-  assert( start.Free.number == 1 );
+  rtems_test_assert(  start.Free.number == 1 );
   to_alloc = start.Free.largest;
 
   /* find the largest we can actually allocate */
@@ -57,15 +57,15 @@ void *POSIX_Init(
    * Verify heap is still in same shape if we couldn't allocate a task
    */
   sb = rtems_workspace_get_information( &info );
-  assert( sb );
-  assert( info.Free.largest == start.Free.largest );
-  assert( info.Free.number  == start.Free.number  );
+  rtems_test_assert(  sb );
+  rtems_test_assert(  info.Free.largest == start.Free.largest );
+  rtems_test_assert(  info.Free.number  == start.Free.number  );
 
   puts( "Init - pthread_key_create - ENOMEM" );
   while (1) {
 
     sb = rtems_workspace_allocate( to_alloc, &alloced );
-    assert( sb );
+    rtems_test_assert(  sb );
 
     sc = pthread_key_create( &key, NULL );
 
@@ -88,9 +88,9 @@ void *POSIX_Init(
       printf( "Init - workspace free/blocks = %d/%d\n",
         info.Free.largest, info.Free.number );
     #endif
-    assert( sb );
-    assert( info.Free.largest == start.Free.largest );
-    assert( info.Free.number  == start.Free.number  );
+    rtems_test_assert(  sb );
+    rtems_test_assert(  info.Free.largest == start.Free.largest );
+    rtems_test_assert(  info.Free.number  == start.Free.number  );
 
     to_alloc -= 8;
     if ( to_alloc == 0 )
@@ -105,7 +105,7 @@ void *POSIX_Init(
    */
   puts( "Init - pthread_key_delete - OK" );
   sc = pthread_key_delete( key );
-  assert( sc == 0 );
+  rtems_test_assert(  sc == 0 );
 
   puts( "Init - verify workspace has same memory" );
   sb = rtems_workspace_get_information( &info );
@@ -113,9 +113,9 @@ void *POSIX_Init(
     printf( "Init - workspace free/blocks = %d/%d\n",
       info.Free.largest, info.Free.number );
   #endif
-  assert( sb );
-  assert( info.Free.largest == start.Free.largest );
-  assert( info.Free.number  == start.Free.number  );
+  rtems_test_assert(  sb );
+  rtems_test_assert(  info.Free.largest == start.Free.largest );
+  rtems_test_assert(  info.Free.number  == start.Free.number  );
 
   puts( "*** END OF TEST KEY 02 ***" );
   rtems_test_exit(0);