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

diff --git a/testsuites/psxtests/psxkey03/init.c b/testsuites/psxtests/psxkey03/init.c
index d69059072e..d551a444c2 100644
--- a/testsuites/psxtests/psxkey03/init.c
+++ b/testsuites/psxtests/psxkey03/init.c
@@ -30,7 +30,7 @@ void *Test_Thread(
 
   puts( "Test_Thread - pthread_setspecific - OK" );
   sc = pthread_setspecific( Key, key_value );
-  assert( !sc );
+  rtems_test_assert(  !sc );
 
   puts( "Test_Thread - pthread_exit to run key destructors - OK" );
   return NULL;
@@ -51,21 +51,21 @@ void *POSIX_Init(
    */
   puts( "Init - pthread_key_create with NULL destructor - OK" );
   sc = pthread_key_create( &Key, NULL );
-  assert( !sc );
+  rtems_test_assert(  !sc );
 
   puts( "Init - pthread_create - OK" );
   sc = pthread_create( &thread, NULL, Test_Thread, &sc );
-  assert( !sc );
+  rtems_test_assert(  !sc );
 
   puts( "Init - sleep - let thread run - OK" );
   delay_request.tv_sec = 0;
   delay_request.tv_nsec = 5 * 100000000;
   sc = nanosleep( &delay_request, NULL );
-  assert( !sc );
+  rtems_test_assert(  !sc );
 
   puts( "Init - pthread_key_delete - OK" );
   sc = pthread_key_delete( Key );
-  assert( sc == 0 );
+  rtems_test_assert(  sc == 0 );
 
   /*
    *  Key with non-NULL destructor
@@ -73,22 +73,22 @@ void *POSIX_Init(
   destructor_ran = false;
   puts( "Init - pthread_key_create with non-NULL destructor - OK" );
   sc = pthread_key_create( &Key, destructor );
-  assert( !sc );
+  rtems_test_assert(  !sc );
 
   puts( "Init - pthread_create - OK" );
   sc = pthread_create( &thread, NULL, Test_Thread, NULL );
-  assert( !sc );
+  rtems_test_assert(  !sc );
 
   puts( "Init - sleep - let thread run - OK" );
   sc = nanosleep( &delay_request, NULL );
-  assert( !sc );
+  rtems_test_assert(  !sc );
 
   puts( "Init - verify destructor did NOT ran" );
-  assert( destructor_ran == false );
+  rtems_test_assert(  destructor_ran == false );
 
   puts( "Init - pthread_key_delete - OK" );
   sc = pthread_key_delete( Key );
-  assert( sc == 0 );
+  rtems_test_assert(  sc == 0 );
 
   puts( "*** END OF TEST KEY 03 ***" );
   rtems_test_exit(0);