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.

3 files changed, 13 insertions, 13 deletions

diff --git a/testsuites/psxtests/psx08/init.c b/testsuites/psxtests/psx08/init.c
index 827014604d..ec68b0c5fe 100644
--- a/testsuites/psxtests/psx08/init.c
+++ b/testsuites/psxtests/psx08/init.c
@@ -33,22 +33,22 @@ void *POSIX_Init(
 
   puts( "Init: pthread_detach - ESRCH (invalid id)" );
   status = pthread_detach( (pthread_t) -1 );
-  assert( status == ESRCH );
+  rtems_test_assert(  status == ESRCH );
 
   /* detach this thread */
 
   puts( "Init: pthread_detach self" );
   status = pthread_detach( pthread_self() );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* create thread */
 
   status = pthread_create( &Task1_id, NULL, Task_1, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: pthread_join - ESRCH (invalid id)" );
   status = pthread_join( (pthread_t) -1, &return_pointer );
-  assert( status == ESRCH );
+  rtems_test_assert(  status == ESRCH );
 
   puts( "Init: pthread_join - SUCCESSFUL" );
   status = pthread_join( Task1_id, &return_pointer );
@@ -56,7 +56,7 @@ void *POSIX_Init(
   puts( "Init: returned from pthread_join through return" );
   if ( status )
     printf( "status = %d\n", status );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   if ( return_pointer == &Task1_id )
     puts( "Init: pthread_join returned correct pointer" );
@@ -69,10 +69,10 @@ void *POSIX_Init(
 
   puts( "Init: creating two pthreads" );
   status = pthread_create( &Task2_id, NULL, Task_2, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = pthread_create( &Task3_id, NULL, Task_3, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: pthread_join - SUCCESSFUL" );
   status = pthread_join( Task2_id, &return_pointer );
@@ -81,7 +81,7 @@ void *POSIX_Init(
   puts( "Init: returned from pthread_join through pthread_exit" );
   if ( status )
     printf( "status = %d\n", status );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   if ( return_pointer == &Task2_id )
     puts( "Init: pthread_join returned correct pointer" );
diff --git a/testsuites/psxtests/psx08/task2.c b/testsuites/psxtests/psx08/task2.c
index d7f8fc003c..612176404f 100644
--- a/testsuites/psxtests/psx08/task2.c
+++ b/testsuites/psxtests/psx08/task2.c
@@ -8,7 +8,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -37,13 +37,13 @@ void *Task_2(
   status = pthread_join( Init_id, NULL );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
 
   puts( "Task_2: join to self task (Init) -- EDEADLK" );
   status = pthread_join( pthread_self(), NULL );
   if ( status != EDEADLK )
     printf( "status = %d\n", status );
-  assert( status == EDEADLK );
+  rtems_test_assert(  status == EDEADLK );
 
   puts( "Task_2: exitting" );
 
diff --git a/testsuites/psxtests/psx08/task3.c b/testsuites/psxtests/psx08/task3.c
index 24aa724fc7..e09c239e38 100644
--- a/testsuites/psxtests/psx08/task3.c
+++ b/testsuites/psxtests/psx08/task3.c
@@ -8,7 +8,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -33,7 +33,7 @@ void *Task_3(
   puts( "Task_3: returned from pthread_join" );
   if ( status )
     printf( "status = %d\n", status );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   if ( return_pointer == &Task2_id )
     puts( "Task_3: pthread_join returned correct pointer" );