Index: testsuites/itrontests/ChangeLog
===================================================================
--- testsuites/itrontests/ChangeLog	(revision 0160b3b9d2825a6d72a0c768764c53ac6bddcfd8)
+++ testsuites/itrontests/ChangeLog	(revision d35734dd77149fc96d3a282c16d6eb4c84ec3d66)
@@ -1,2 +1,10 @@
+2009-12-08	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* itronmbf01/init.c, itronsem01/init.c, itronsem01/system.h,
+	itrontask02/dormant.c, itrontask02/init.c, itrontask03/init.c,
+	itrontask03/preempt.c: Use rtems_test_assert() consistently instead
+	of system assert(). rtems_test_assert() is designed to integrate into
+	the RTEMS test suite infrastructure.
+
 2009-10-30	Ralf CorsÃ©pius <ralf.corsepius@rtems.org>
 
Index: testsuites/itrontests/itronmbf01/init.c
===================================================================
--- testsuites/itrontests/itronmbf01/init.c	(revision 0160b3b9d2825a6d72a0c768764c53ac6bddcfd8)
+++ testsuites/itrontests/itronmbf01/init.c	(revision d35734dd77149fc96d3a282c16d6eb4c84ec3d66)
@@ -11,5 +11,5 @@
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -24,5 +24,4 @@
 #include "system.h"
 #include <stdio.h>
-#include <assert.h>
 
 /*
@@ -77,5 +76,5 @@
     puts( "Init - cre_mbf - NULL pk_cmbf returns E_PAR" );
     status = cre_mbf( 1, NULL );
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - cre_mbf - negative values for bufsz returns E_PAR" );
@@ -85,5 +84,5 @@
     pk_cmbf.exinf   = NULL;
     status = cre_mbf( 1, &pk_cmbf );
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - cre_mbf - negative values for maxmsz returns E_PAR" );
@@ -91,5 +90,5 @@
     pk_cmbf.maxmsz  = -1;
     status = cre_mbf( 1, &pk_cmbf );
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - cre_mbf - bufsz < maxmsz returns E_PAR" );
@@ -97,5 +96,5 @@
     pk_cmbf.maxmsz  = 101;
     status = cre_mbf( 1, &pk_cmbf );
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     /*
@@ -107,17 +106,17 @@
     puts( "Init - cre_mbf - bad id (less than -4) - E_OACV" );
     status = cre_mbf( -5, &pk_cmbf );
-    assert( status == E_OACV );
+    rtems_test_assert( status == E_OACV );
 
     puts( "Init - cre_mbf - bad id (between 0 and -4) - E_ID" );
     status = cre_mbf( -4, &pk_cmbf );
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - cre_mbf - bad id (0) - E_ID" );
     status = cre_mbf( 0, &pk_cmbf );
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - cre_mbf - bad id (too great) - E_ID" );
     status = cre_mbf( CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1, &pk_cmbf );
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - cre_mbf - create mbf 1 TA_TFIFO - E_OK" );
@@ -126,9 +125,9 @@
     pk_cmbf.mbfatr  = TA_TFIFO;
     status = cre_mbf( 1, &pk_cmbf );
-    assert( status == E_OK );
+    rtems_test_assert( status == E_OK );
 
     puts( "Init - cre_mbf - create mbf 1 again - E_OBJ" );
     status = cre_mbf( 1, &pk_cmbf );
-    assert( status == E_OBJ );
+    rtems_test_assert( status == E_OBJ );
 
     puts( "Init - cre_mbf - create mbf 2 TA_TPRI - E_OK" );
@@ -137,5 +136,5 @@
     pk_cmbf.mbfatr  = TA_TPRI;
     status = cre_mbf( 2, &pk_cmbf );
-    assert( status == E_OK );
+    rtems_test_assert( status == E_OK );
 }
 
@@ -150,22 +149,22 @@
     puts( "Init - del_mbf - bad id (less than -4) - E_OACV" );
     status = del_mbf( -5 );
-    assert( status == E_OACV );
+    rtems_test_assert( status == E_OACV );
 
     puts( "Init - del_mbf - bad id (between 0 and -4) - E_ID" );
     status = del_mbf( -4 );
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - del_mbf - bad id (0) - E_ID" );
     status = del_mbf( 0 );
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - del_mbf - bad id (too great) - E_ID" );
     status = del_mbf( CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1 );
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
 
     puts("Init - del_mbf   - E_OK" );
     status = del_mbf(2);
-    assert(status == E_OK);
+    rtems_test_assert(status == E_OK);
 }
 
@@ -181,34 +180,34 @@
     puts( "Init - psnd_mbf - bad id (less than -4) - E_OACV" );
     status = psnd_mbf(-5, msg, sizeof(msg));
-    assert( status == E_OACV );
+    rtems_test_assert( status == E_OACV );
 
     puts( "Init - psnd_mbf - bad id (between 0 and -4) - E_ID" );
     status = psnd_mbf(-4, msg, sizeof(msg));
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - psnd_mbf - bad id (0) - E_ID" );
     status = psnd_mbf(0, msg, sizeof(msg));
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - psnd_mbf - bad id (too great) - E_ID" );
     status = psnd_mbf(CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1, msg,
                       sizeof(msg));
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - psnd_mbf - msg == 0, E_PAR" );
     status = psnd_mbf(1, 0, sizeof(msg));
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - psnd_mbf - msgsz too big - E_PAR" );
     status = psnd_mbf(1, msg, 300);
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - psnd_mbf - msgsz <0 - E_PAR" );
     status = psnd_mbf(1, msg, -10);
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - psnd_mbf - E_OK" );
     status = psnd_mbf(1, msg, sizeof(msg));
-    assert( status == E_OK );
+    rtems_test_assert( status == E_OK );
 }
 
@@ -220,26 +219,26 @@
     puts( "Init - ref_mbf - bad id (less than -4) - E_OACV" );
     status = ref_mbf(&pk_rmbf, -5);
-    assert( status == E_OACV );
+    rtems_test_assert( status == E_OACV );
 
     puts( "Init - ref_mbf - bad id (between 0 and -4) - E_ID" );
     status = ref_mbf(&pk_rmbf, -4);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - ref_mbf - bad id (0) - E_ID" );
     status = ref_mbf(&pk_rmbf, 0);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - ref_mbf - bad id (too great) - E_ID" );
     status = ref_mbf(&pk_rmbf,
                      CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - ref_mbf - NULL pk_mbf returns E_PAR" );
     status = ref_mbf( NULL, 1 );
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - ref_mbf - mbf 1 - E_OK" );
     status = ref_mbf( &pk_rmbf, 1 );
-    assert( status == E_OK );
+    rtems_test_assert( status == E_OK );
 
     printf( "Init - mbf 1 msgsz = %" PRId32 "\n", pk_rmbf.msgsz );
@@ -257,29 +256,29 @@
     puts( "Init - rcv_mbf - bad id (less than -4) - E_OACV" );
     status = rcv_mbf(buffer, &s, -5);
-    assert( status == E_OACV );
+    rtems_test_assert( status == E_OACV );
 
     puts( "Init - rcv_mbf - bad id (between 0 and -4) - E_ID" );
     status = rcv_mbf(buffer, &s, -4);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - rcv_mbf - bad id (0) - E_ID" );
     status = rcv_mbf(buffer, &s, 0);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - rcv_mbf - bad id (too great) - E_ID" );
     status = rcv_mbf(buffer, &s, CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - rcv_mbf - NULL msg returns E_PAR" );
     status = rcv_mbf(NULL, &s, 1);
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - rcv_mbf - NULL p_msgsz returns E_PAR" );
     status = rcv_mbf(buffer, 0, 1);
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts("Init - rcv_mbf -- OK");
     status = rcv_mbf(buffer, &s, 1);
-    assert(status == E_OK);
+    rtems_test_assert(status == E_OK);
     printf("Message:[%s], length:%" PRId32 "\n", buffer, s);
 }
@@ -294,29 +293,29 @@
     puts( "Init - prcv_mbf - bad id (less than -4) - E_OACV" );
     status = prcv_mbf(buffer, &s, -5);
-    assert( status == E_OACV );
+    rtems_test_assert( status == E_OACV );
 
     puts( "Init - prcv_mbf - bad id (between 0 and -4) - E_ID" );
     status = prcv_mbf(buffer, &s, -4);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - prcv_mbf - bad id (0) - E_ID" );
     status = prcv_mbf(buffer, &s, 0);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - prcv_mbf - bad id (too great) - E_ID" );
     status = prcv_mbf(buffer, &s, CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - prcv_mbf - NULL msg returns E_PAR" );
     status = prcv_mbf(NULL, &s, 1);
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - prcv_mbf - NULL p_msgsz returns E_PAR" );
     status = prcv_mbf(buffer, 0, 1);
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts("Init - prcv_mbf -- E_TMOUT");
     status = prcv_mbf(buffer, &s, 1);
-    assert(status == E_TMOUT);
+    rtems_test_assert(status == E_TMOUT);
 }
 
@@ -330,13 +329,13 @@
     puts( "Init - trcv_mbf - bad id (less than -4) - E_OACV" );
     status = trcv_mbf(buffer, &s, -5, 5000);
-    assert( status == E_OACV );
+    rtems_test_assert( status == E_OACV );
 
     puts( "Init - trcv_mbf - bad id (between 0 and -4) - E_ID" );
     status = trcv_mbf(buffer, &s, -4, 5000);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - trcv_mbf - bad id (0) - E_ID" );
     status = trcv_mbf(buffer, &s, 0, 5000);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - trcv_mbf - bad id (too great) - E_ID" );
@@ -344,22 +343,22 @@
                       CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS + 1,
                       5000);
-    assert( status == E_ID );
+    rtems_test_assert( status == E_ID );
 
     puts( "Init - trcv_mbf - NULL msg returns E_PAR" );
     status = trcv_mbf(NULL, &s, 1, 5000);
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - trcv_mbf - NULL p_msgsz returns E_PAR" );
     status = trcv_mbf(buffer, 0, 1, 5000);
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts( "Init - trcv_mbf - tmout <-2  returns E_PAR" );
     status = trcv_mbf(buffer, &s, 1, -2);
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     puts("\nInit - trcv_mbf -- E_TMOUT");
     put_time( "Init - starting to block at ");
     status = trcv_mbf(buffer, &s, 1, 1000);
-    assert(status == E_TMOUT);
+    rtems_test_assert(status == E_TMOUT);
     put_time( "Init - time out at ");
 }
Index: testsuites/itrontests/itronsem01/init.c
===================================================================
--- testsuites/itrontests/itronsem01/init.c	(revision 0160b3b9d2825a6d72a0c768764c53ac6bddcfd8)
+++ testsuites/itrontests/itronsem01/init.c	(revision d35734dd77149fc96d3a282c16d6eb4c84ec3d66)
@@ -11,5 +11,5 @@
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -52,5 +52,5 @@
   puts( "Init - cre_sem - NULL pk_sem returns E_PAR" );
   status = cre_sem( 1, NULL );
-  assert( status == E_PAR );
+  rtems_test_assert( status == E_PAR );
 
   puts( "Init - cre_sem - isemcnt > maxsem returns E_PAR" );
@@ -59,5 +59,5 @@
   pk_csem.maxsem  = 2;
   status = cre_sem( 1, &pk_csem );
-  assert( status == E_PAR );
+  rtems_test_assert( status == E_PAR );
 
   puts( "Init - cre_sem - maxsem of 0 returns E_PAR" );
@@ -65,5 +65,5 @@
   pk_csem.maxsem  = 0;
   status = cre_sem( 1, &pk_csem );
-  assert( status == E_PAR );
+  rtems_test_assert( status == E_PAR );
 
   /*
@@ -75,17 +75,17 @@
   puts( "Init - cre_sem - bad id (less than -4) - E_OACV" );
   status = cre_sem( -5, &pk_csem );
-  assert( status == E_OACV );
+  rtems_test_assert( status == E_OACV );
 
   puts( "Init - cre_sem - bad id (between 0 and -4) - E_ID" );
   status = cre_sem( -4, &pk_csem );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - cre_sem - bad id (0) - E_ID" );
   status = cre_sem( 0, &pk_csem );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - cre_sem - bad id (too great) - E_ID" );
   status = cre_sem( CONFIGURE_MAXIMUM_ITRON_SEMAPHORES + 1, &pk_csem );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - cre_sem - create semaphore 1 TA_TFIFO - E_OK" );
@@ -94,9 +94,9 @@
   pk_csem.sematr  = TA_TFIFO;
   status = cre_sem( 1, &pk_csem );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   puts( "Init - cre_sem - create semaphore 1 again - E_OBJ" );
   status = cre_sem( 1, &pk_csem );
-  assert( status == E_OBJ );
+  rtems_test_assert( status == E_OBJ );
 
   puts( "Init - cre_sem - create semaphore 2 TA_TPRI - E_OK" );
@@ -105,5 +105,5 @@
   pk_csem.sematr  = TA_TPRI;
   status = cre_sem( 2, &pk_csem );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   /*
@@ -113,17 +113,17 @@
   puts( "Init - del_sem - bad id (less than -4) - E_OACV" );
   status = del_sem( -5 );
-  assert( status == E_OACV );
+  rtems_test_assert( status == E_OACV );
 
   puts( "Init - del_sem - bad id (between 0 and -4) - E_ID" );
   status = del_sem( -4 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - del_sem - bad id (0) - E_ID" );
   status = del_sem( 0 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - del_sem - bad id (too great) - E_ID" );
   status = del_sem( CONFIGURE_MAXIMUM_ITRON_SEMAPHORES + 1 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   /*
@@ -133,17 +133,17 @@
   puts( "Init - sig_sem - bad id (less than -4) - E_OACV" );
   status = sig_sem( -5 );
-  assert( status == E_OACV );
+  rtems_test_assert( status == E_OACV );
 
   puts( "Init - sig_sem - bad id (between 0 and -4) - E_ID" );
   status = sig_sem( -4 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - sig_sem - bad id (0) - E_ID" );
   status = sig_sem( 0 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - sig_sem - bad id (too great) - E_ID" );
   status = wai_sem( CONFIGURE_MAXIMUM_ITRON_SEMAPHORES + 1 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   /*
@@ -153,17 +153,17 @@
   puts( "Init - preq_sem - bad id (less than -4) - E_OACV" );
   status = preq_sem( -5 );
-  assert( status == E_OACV );
+  rtems_test_assert( status == E_OACV );
 
   puts( "Init - preq_sem - bad id (between 0 and -4) - E_ID" );
   status = preq_sem( -4 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - preq_sem - bad id (0) - E_ID" );
   status = preq_sem( 0 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - preq_sem - bad id (too great) - E_ID" );
   status = preq_sem( CONFIGURE_MAXIMUM_ITRON_SEMAPHORES + 1 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   /*
@@ -173,17 +173,17 @@
   puts( "Init - wai_sem - bad id (less than -4) - E_OACV" );
   status = wai_sem( -5 );
-  assert( status == E_OACV );
+  rtems_test_assert( status == E_OACV );
 
   puts( "Init - wai_sem - bad id (between 0 and -4) - E_ID" );
   status = wai_sem( -4 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - wai_sem - bad id (0) - E_ID" );
   status = wai_sem( 0 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - wai_sem - bad id (too great) - E_ID" );
   status = wai_sem( CONFIGURE_MAXIMUM_ITRON_SEMAPHORES + 1 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   /*
@@ -193,17 +193,17 @@
   puts( "Init - twai_sem - bad id (less than -4) - E_OACV" );
   status = twai_sem( -5, 1000 );
-  assert( status == E_OACV );
+  rtems_test_assert( status == E_OACV );
 
   puts( "Init - twai_sem - bad id (between 0 and -4) - E_ID" );
   status = twai_sem( -4, 1000 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - twai_sem - bad id (0) - E_ID" );
   status = twai_sem( 0, 1000 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - twai_sem - bad id (too great) - E_ID" );
   status = twai_sem( CONFIGURE_MAXIMUM_ITRON_SEMAPHORES + 1, 1000 );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   /*
@@ -213,17 +213,17 @@
   puts( "Init - ref_sem - bad id (less than -4) - E_OACV" );
   status = ref_sem( -5, &pk_rsem );
-  assert( status == E_OACV );
+  rtems_test_assert( status == E_OACV );
 
   puts( "Init - ref_sem - bad id (between 0 and -4) - E_ID" );
   status = ref_sem( -4, &pk_rsem );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - ref_sem - bad id (0) - E_ID" );
   status = ref_sem( 0, &pk_rsem );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   puts( "Init - ref_sem - bad id (too great) - E_ID" );
   status = ref_sem( CONFIGURE_MAXIMUM_ITRON_SEMAPHORES + 1, &pk_rsem );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
 
   /*
@@ -234,25 +234,25 @@
   puts( "Init - preq_sem - semaphore 1 available (count --> 1) - E_OK" );
   status = preq_sem( 1 );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   puts( "Init - preq_sem - semaphore 1 available (count --> 0) - E_OK" );
   status = preq_sem( 1 );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   puts( "Init - preq_sem - semaphore 1 unavailable - E_TMOUT" );
   status = preq_sem( 1 );
-  assert( status == E_TMOUT );
+  rtems_test_assert( status == E_TMOUT );
 
   puts( "Init - sig_sem - semaphore 1 (count --> 1) - E_OK" );
   status = sig_sem( 1 );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   puts("Init - twai_sem(TMO_POL) - semaphore 1 available (count --> 0) - E_OK");
   status = twai_sem( 1, TMO_POL );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   puts( "Init - twai_sem(TMO_POL) - semaphore 1 available - E_TMOUT" );
   status = twai_sem( 1, TMO_POL );
-  assert( status == E_TMOUT );
+  rtems_test_assert( status == E_TMOUT );
 
   /*
@@ -263,5 +263,5 @@
   put_time( "Init - starting to block at ");
   status = twai_sem( 1, 1000 );
-  assert( status == E_TMOUT );
+  rtems_test_assert( status == E_TMOUT );
   put_time( "Init - timed out at ");
   puts( "Init - twai_sem - semaphore 1 unavailable - timeout completed" );
@@ -273,17 +273,17 @@
   puts( "Init - sig_sem - semaphore 1 (count --> 1) - E_OK" );
   status = sig_sem( 1 );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   puts( "Init - sig_sem - semaphore 1 (count --> 2) - E_OK" );
   status = sig_sem( 1 );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   puts( "Init - sig_sem - semaphore 1 (count --> 3) - E_OK" );
   status = sig_sem( 1 );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   puts( "Init - sig_sem - semaphore 1 (count > maximum) - E_QOVR" );
   status = sig_sem( 1 );
-  assert( status == E_QOVR );
+  rtems_test_assert( status == E_QOVR );
 
   /*
@@ -293,9 +293,9 @@
   puts( "Init - ref_sem - NULL pk_sem returns E_PAR" );
   status = ref_sem( 1, NULL );
-  assert( status == E_PAR );
+  rtems_test_assert( status == E_PAR );
 
   puts( "Init - ref_sem - semaphore 1 - E_OK" );
   status = ref_sem( 1, &pk_rsem );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
   printf( "Init - semaphore 1 count = %" PRId32 "\n", pk_rsem.semcnt );
   printf( "Init - semaphore 1 waiting tasks = %d\n", pk_rsem.wtsk );
@@ -303,9 +303,9 @@
   puts( "Init - preq_sem - semaphore 1 (count --> 2) - E_OK" );
   status = preq_sem( 1 );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   puts( "Init - ref_sem - semaphore 1 - E_OK" );
   status = ref_sem( 1, &pk_rsem );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
   printf( "Init - semaphore 1 count = %" PRId32 "\n", pk_rsem.semcnt );
   printf( "Init - semaphore 1 waiting tasks = %d\n", pk_rsem.wtsk );
@@ -320,5 +320,5 @@
   puts( "Init - del_sem - semaphore 1 deleted - E_OK" );
   status = del_sem( 1 );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   puts( "Init - XXX need other tasks to complete the test XXX" );
@@ -326,5 +326,5 @@
   puts( "Init - dly_tsk - 1 second to let other task run" );
   status = dly_tsk( 1000 );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   printf( "*** END OF ITRONSEM01 -- ITRON SEMAPHORE TEST ***\n" );
Index: testsuites/itrontests/itronsem01/system.h
===================================================================
--- testsuites/itrontests/itronsem01/system.h	(revision 0160b3b9d2825a6d72a0c768764c53ac6bddcfd8)
+++ testsuites/itrontests/itronsem01/system.h	(revision d35734dd77149fc96d3a282c16d6eb4c84ec3d66)
@@ -4,5 +4,5 @@
  *  function in the test set.
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -16,5 +16,4 @@
 #include <tmacros.h>
 #include <rtems/itron.h>
-#include <assert.h>
 
 /* functions */
Index: testsuites/itrontests/itrontask02/dormant.c
===================================================================
--- testsuites/itrontests/itrontask02/dormant.c	(revision 0160b3b9d2825a6d72a0c768764c53ac6bddcfd8)
+++ testsuites/itrontests/itrontask02/dormant.c	(revision d35734dd77149fc96d3a282c16d6eb4c84ec3d66)
@@ -19,5 +19,4 @@
  */
 
-#include <assert.h>
 #include "system.h"
 
@@ -28,5 +27,5 @@
 
   puts( "ERROR==>ext_tsk of DORMANT returned" );
-  assert(0);
+  rtems_test_assert(0);
 }
 
Index: testsuites/itrontests/itrontask02/init.c
===================================================================
--- testsuites/itrontests/itrontask02/init.c	(revision 0160b3b9d2825a6d72a0c768764c53ac6bddcfd8)
+++ testsuites/itrontests/itrontask02/init.c	(revision d35734dd77149fc96d3a282c16d6eb4c84ec3d66)
@@ -11,5 +11,5 @@
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -24,5 +24,4 @@
 #include "system.h"
 #include <stdio.h>
-#include <assert.h>
 
 void ITRON_Init( void )
@@ -332,5 +331,5 @@
   puts( "Init - chg_pri - change priority of TSK_SELF - E_OBJ" );
   status = chg_pri( XXX - INTERRUPT, 1 );
-  assert( status == E_OBJ );
+  rtems_test_assert( status == E_OBJ );
   */
 
@@ -411,5 +410,5 @@
   puts( "Init - ref_tsk - reference INTERRUPT - E_ID" );
   status = ref_tsk( &pk_rtsk, TSK_SELF );
-  assert( status == E_ID );
+  rtems_test_assert( status == E_ID );
   */
 
Index: testsuites/itrontests/itrontask03/init.c
===================================================================
--- testsuites/itrontests/itrontask03/init.c	(revision 0160b3b9d2825a6d72a0c768764c53ac6bddcfd8)
+++ testsuites/itrontests/itrontask03/init.c	(revision d35734dd77149fc96d3a282c16d6eb4c84ec3d66)
@@ -11,5 +11,5 @@
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -24,5 +24,4 @@
 #include "system.h"
 #include <stdio.h>
-#include <assert.h>
 
 void ITRON_Init( void )
@@ -135,4 +134,4 @@
 
   exd_tsk();
-  assert(0);
+  rtems_test_assert(0);
 }
Index: testsuites/itrontests/itrontask03/preempt.c
===================================================================
--- testsuites/itrontests/itrontask03/preempt.c	(revision 0160b3b9d2825a6d72a0c768764c53ac6bddcfd8)
+++ testsuites/itrontests/itrontask03/preempt.c	(revision d35734dd77149fc96d3a282c16d6eb4c84ec3d66)
@@ -8,5 +8,5 @@
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -18,5 +18,4 @@
  */
 
-#include <assert.h>
 #include "system.h"
 
@@ -31,9 +30,9 @@
   status = ref_tsk( &pk_rtsk, PREEMPT_TASK_ID );
   fatal_directive_status( status, E_OK , "ref_tsk of PREEMPT");
-  assert( pk_rtsk.tskpri  == PREEMPT_PRIORITY );
-  assert( pk_rtsk.itskpri == PREEMPT_PRIORITY );
-  assert( pk_rtsk.task    == Preempt_task );
-  assert( pk_rtsk.stksz   >= RTEMS_MINIMUM_STACK_SIZE );
-  assert( pk_rtsk.tskstat == (TTS_RUN | TTS_RDY) );
+  rtems_test_assert( pk_rtsk.tskpri  == PREEMPT_PRIORITY );
+  rtems_test_assert( pk_rtsk.itskpri == PREEMPT_PRIORITY );
+  rtems_test_assert( pk_rtsk.task    == Preempt_task );
+  rtems_test_assert( pk_rtsk.stksz   >= RTEMS_MINIMUM_STACK_SIZE );
+  rtems_test_assert( pk_rtsk.tskstat == (TTS_RUN | TTS_RDY) );
 
   if ( Preempt_task_Count == 0 ) {
@@ -44,10 +43,10 @@
     puts( "PREEMPT - ext_tsk - going to DORMANT state" );
     ext_tsk( );
-    assert( 0 );
+    rtems_test_assert( 0 );
   } else {
     Preempt_task_Count ++;
     puts( "PREEMPT - exd_tsk - Exit and Delete task" );
     exd_tsk(  );
-    assert( 0 );
+    rtems_test_assert( 0 );
   }
 }
