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.

4 files changed, 62 insertions, 62 deletions

diff --git a/testsuites/psxtests/psx10/init.c b/testsuites/psxtests/psx10/init.c
index a0b80ad29b..488a501adf 100644
--- a/testsuites/psxtests/psx10/init.c
+++ b/testsuites/psxtests/psx10/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -29,61 +29,61 @@ void *POSIX_Init(
 
   puts( "Init: pthread_condattr_init" );
   status = pthread_condattr_init( &attr );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: pthread_condattr_init - EINVAL (attribute invalid)" );
   status = pthread_condattr_init( NULL );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
 
   puts( "Init: pthread_condattr_destroy" );
   status = pthread_condattr_destroy( &attr );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: pthread_condattr_destroy - EINVAL (attribute invalid)" );
   status = pthread_condattr_destroy( NULL );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
 
   puts( "Init: pthread_condattr_init" );
   status = pthread_condattr_init( &attr );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: pthread_condattr_setpshared - PTHREAD_PROCESS_SHARED" );
   status = pthread_condattr_setpshared( &attr, PTHREAD_PROCESS_SHARED );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: pthread_condattr_setpshared - PTHREAD_PROCESS_PRIVATE" );
   status = pthread_condattr_setpshared( &attr, PTHREAD_PROCESS_PRIVATE );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = pthread_condattr_setpshared( NULL, PTHREAD_PROCESS_PRIVATE );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_condattr_setpshared - EINVAL (attribute invalid)" );
 
   status = pthread_condattr_setpshared( &attr, 0x7FFF );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_condattr_setpshared - EINVAL (pshared invalid)" );
 
   status = pthread_condattr_getpshared( &attr, &pshared );
-  assert( !status );
+  rtems_test_assert(  !status );
   printf( "Init: pthread_condattr_getpshared - %d\n", pshared );
 
   status = pthread_condattr_getpshared( NULL, &pshared );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_condattr_getpshared - EINVAL (attribute invalid)" );
 
   puts( "Init: pthread_cond_init - NULL attr" );
   status = pthread_cond_init( &cond, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* error for attribute not initialized */
 
@@ -91,39 +91,39 @@ void *POSIX_Init(
   status = pthread_cond_init( &cond, &attr_error );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_cond_init - EINVAL (attr not initialized)" );
 
   status = pthread_cond_init( &cond, NULL );
   if ( status != ENOMEM )
     printf( "status = %d\n", status );
-  assert( status == ENOMEM );
+  rtems_test_assert(  status == ENOMEM );
   puts( "Init: pthread_cond_init - ENOMEM (too many conds)" );
 
   puts( "Init: pthread_cond_destroy" );
   status = pthread_cond_destroy( &cond );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* error for bad condition variable passed */
 
   status = pthread_cond_destroy( NULL );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_cond_destroy - EINVAL (cond invalid)" );
 
 /* initiailize the attribute for the rest of the test */
 
   puts( "Init: pthread_cond_init - attr" );
   status = pthread_cond_init( &Cond1_id, &attr );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* signal task1 with a condition variable */
 
   empty_line();
 
   status = pthread_create( &Task_id, NULL, Task_1, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* switch to task1 to allow it to wait for a condition variable */
 
@@ -133,17 +133,17 @@ void *POSIX_Init(
   status = pthread_cond_destroy( &Cond1_id );
   if ( status != EBUSY )
     printf( "status = %d\n", status );
-  assert( status == EBUSY );
+  rtems_test_assert(  status == EBUSY );
   puts( "Init: pthread_cond_destroy - EBUSY (task1 waiting)" );
 
   puts( "Init: pthread_cond_signal" );
   status = pthread_cond_signal( &Cond1_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   empty_line();
 
   status = pthread_create( &Task2_id, NULL, Task_2, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* switch to task1 and task2 to allow them to wait for broadcast signal */
 
@@ -154,7 +154,7 @@ void *POSIX_Init(
 
   puts( "Init: pthread_cond_broadcast" );
   status = pthread_cond_broadcast( &Cond1_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Init: sleep - switch to Task_1" );
   sleep( 0 );
@@ -162,12 +162,12 @@ void *POSIX_Init(
 /* timedwait case - timeout */
 
   status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* set timeout to 3 seconds */
 
   status = clock_gettime( CLOCK_REALTIME, &timeout );
-  assert( !status );
+  rtems_test_assert(  !status );
   timeout.tv_sec += 3;
   timeout.tv_nsec = 0;
 
@@ -175,11 +175,11 @@ void *POSIX_Init(
   status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout );
   if ( status != ETIMEDOUT )
     printf( "status = %d\n", status );
-  assert( status == ETIMEDOUT );
+  rtems_test_assert(  status == ETIMEDOUT );
   puts( "Init: pthread_cond_timedwait - ETIMEDOUT - (mutex not acquired)" );
 
   status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* remaining error messages */
 
@@ -190,78 +190,78 @@ void *POSIX_Init(
   status = pthread_cond_signal( NULL );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_cond_signal - EINVAL (cond invalid)" );
 
   status = pthread_cond_broadcast( NULL );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_cond_broadcast - EINVAL (cond invalid)" );
 
 /* acquire mutex so errors will occur */
 
   status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = pthread_cond_wait( NULL, &Mutex_id );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_cond_wait - EINVAL (cond invalid)" );
 
   status = pthread_cond_timedwait( NULL, &Mutex_id, &timeout );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_cond_timedwait - EINVAL (cond invalid)" );
 
   status = pthread_cond_wait( &Cond1_id, NULL );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_cond_wait - EINVAL (mutex invalid)" );
 
   status = pthread_cond_timedwait( &Cond1_id, NULL, &timeout );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_cond_timedwait - EINVAL (mutex invalid)" );
 
   status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, NULL );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Init: pthread_cond_timedwait - EINVAL (abstime NULL)" );
 
   status = clock_gettime( CLOCK_REALTIME, &timeout );
-  assert( !status );
+  rtems_test_assert(  !status );
   timeout.tv_sec -= 1;
   status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout );
   if ( status != ETIMEDOUT )
     printf( "status = %d\n", status );
-  assert( status == ETIMEDOUT );
+  rtems_test_assert(  status == ETIMEDOUT );
   puts( "Init: pthread_cond_timedwait - ETIMEDOUT (abstime->tv_sec < current time)" );
   status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   /* ensure we do not catch a 0 nanosecond boundary */
   do {
     status = clock_gettime( CLOCK_REALTIME, &timeout );
-    assert( !status );
+    rtems_test_assert(  !status );
     timeout.tv_nsec -= 1;
   } while ( timeout.tv_nsec < 0);
 
   status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout );
   if ( status != ETIMEDOUT )
     printf( "status = %d\n", status );
-  assert( status == ETIMEDOUT );
+  rtems_test_assert(  status == ETIMEDOUT );
   puts( "Init: pthread_cond_timedwait - ETIMEDOUT (abstime->tv_nsec < current time)" );
   status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* wait and timedwait without mutex */
 
@@ -270,26 +270,26 @@ void *POSIX_Init(
  *   status = pthread_cond_wait( &Cond1_id, &Mutex_id );
  *   if ( status != EINVAL )
  *     printf( "status = %d\n", status );
- *   assert( status == EINVAL );
+ *   rtems_test_assert(  status == EINVAL );
  */
   puts( "Init: pthread_cond_wait - EINVAL (mutex not locked before call)" );
 
 /* XXX - this case is commented out in the code pending review
  *
  *  status = clock_gettime( CLOCK_REALTIME, &timeout );
- *  assert( !status );
+ *  rtems_test_assert(  !status );
  *  timeout.tv_sec += 1;
  *  status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout );
  *  if ( status != EINVAL )
  *    printf( "status = %d\n", status );
- *  assert( status == EINVAL );
+ *  rtems_test_assert(  status == EINVAL );
  */
   puts( "Init: pthread_cond_timedwait - EINVAL (mutex not locked before call)");
 
   empty_line();
 
   status = pthread_create( &Task3_id, NULL, Task_3, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* switch to task3 to allow it to wait for broadcast signal */
 
@@ -299,7 +299,7 @@ void *POSIX_Init(
 /* destroy the mutex so Task3 can not acguire at the end of Wait_support */
 
   status = pthread_mutex_destroy( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* signal a condition variable to task3 */
 
diff --git a/testsuites/psxtests/psx10/task.c b/testsuites/psxtests/psx10/task.c
index fb49b1544a..8e53bc4927 100644
--- a/testsuites/psxtests/psx10/task.c
+++ b/testsuites/psxtests/psx10/task.c
@@ -7,7 +7,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
@@ -31,31 +31,31 @@ void *Task_1(
   printf( "Task_1: ID is 0x%08" PRIxpthread_t "\n", Task_id );
 
   status = pthread_mutex_init( &Mutex_id, NULL );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Task_1: pthread_cond_wait" );
   status = pthread_cond_wait( &Cond1_id, &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Task_1: back from pthread_cond_wait release mutex" );
   status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
 /* wait for a condition variable broadcast from Init */
 
   status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Task_1: pthread_cond_wait" );
   status = pthread_cond_wait( &Cond1_id, &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Task_1: back from pthread_cond_wait release mutex" );
   status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Task_1: task exit" );
   pthread_exit( NULL );
diff --git a/testsuites/psxtests/psx10/task2.c b/testsuites/psxtests/psx10/task2.c
index 6aef292030..dcf1847945 100644
--- a/testsuites/psxtests/psx10/task2.c
+++ b/testsuites/psxtests/psx10/task2.c
@@ -7,7 +7,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
@@ -29,15 +29,15 @@ void *Task_2(
   printf( "Task_2: ID is 0x%08" PRIxpthread_t "\n", Task_id );
 
   status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Task_2: pthread_cond_wait" );
   status = pthread_cond_wait( &Cond1_id, &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Task_2: back from pthread_cond_wait release mutex" );
   status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Task_2: task exit" );
   pthread_exit( NULL );
diff --git a/testsuites/psxtests/psx10/task3.c b/testsuites/psxtests/psx10/task3.c
index fdf18fbe8f..f3493aeb16 100644
--- a/testsuites/psxtests/psx10/task3.c
+++ b/testsuites/psxtests/psx10/task3.c
@@ -7,7 +7,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
@@ -29,13 +29,13 @@ void *Task_3(
   printf( "Task_3: ID is 0x%08" PRIxpthread_t "\n", Task_id );
 
   status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
+  rtems_test_assert(  !status );
 
   puts( "Task_3: pthread_cond_wait" );
   status = pthread_cond_wait( &Cond1_id, &Mutex_id );
   if ( status != EINVAL )
     printf( "status = %d\n", status );
-  assert( status == EINVAL );
+  rtems_test_assert(  status == EINVAL );
   puts( "Task_3: pthread_cond_wait - EINVAL (mutex not locked after signal)");
 
   puts( "Task_3: task exit" );