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.

8 files changed, 128 insertions, 126 deletions

diff --git a/testsuites/itrontests/ChangeLog b/testsuites/itrontests/ChangeLog
index 4c456f70fd..669cacfe2e 100644
--- a/testsuites/itrontests/ChangeLog
+++ b/testsuites/itrontests/ChangeLog
@@ -1,3 +1,11 @@
+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>
 
 	* itrontime01/init.c: Use %ld to print "time"s.
diff --git a/testsuites/itrontests/itronmbf01/init.c b/testsuites/itrontests/itronmbf01/init.c
index f20e909f2d..b39841385a 100644
--- a/testsuites/itrontests/itronmbf01/init.c
+++ b/testsuites/itrontests/itronmbf01/init.c
@@ -10,7 +10,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -23,7 +23,6 @@
 #define CONFIGURE_INIT
 #include "system.h"
 #include <stdio.h>
-#include <assert.h>
 
 /*
  *  The following is hopefully temporary.
@@ -76,7 +75,7 @@ void TestCre(void)
 
     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" );
     pk_cmbf.bufsz = -1;
@@ -84,19 +83,19 @@ void TestCre(void)
     pk_cmbf.mbfatr  = 0;
     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" );
     pk_cmbf.bufsz = 100;
     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" );
     pk_cmbf.bufsz = 100;
     pk_cmbf.maxmsz  = 101;
     status = cre_mbf( 1, &pk_cmbf );
-    assert( status == E_PAR );
+    rtems_test_assert( status == E_PAR );
 
     /*
      *  Now run through all the bad ID errors
@@ -106,37 +105,37 @@ void TestCre(void)
     pk_cmbf.maxmsz = 30;
     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" );
     pk_cmbf.bufsz = 600;
     pk_cmbf.maxmsz  = 200;
     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" );
     pk_cmbf.bufsz = 600;
     pk_cmbf.maxmsz  = 200;
     pk_cmbf.mbfatr  = TA_TPRI;
     status = cre_mbf( 2, &pk_cmbf );
-    assert( status == E_OK );
+    rtems_test_assert( status == E_OK );
 }
 
 void TestDel(void)
@@ -149,24 +148,24 @@ void TestDel(void)
 
     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);
 }
 
 void TestPsnd(void)
@@ -180,36 +179,36 @@ void TestPsnd(void)
 
     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 );
 }
 
 void TestRef(void)
@@ -219,28 +218,28 @@ void TestRef(void)
 
     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 );
     printf( "Init - mbf 1 frbufsz = %" PRId32 "\n", pk_rmbf.frbufsz );
@@ -256,31 +255,31 @@ void TestRcv(void)
 
     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);
 }
 
@@ -293,31 +292,31 @@ void TestPrcv(void)
 
     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);
 }
 
 
@@ -329,37 +328,37 @@ void TestTrcv(void)
 
     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" );
     status = trcv_mbf(buffer, &s,
                       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 ");
 }
diff --git a/testsuites/itrontests/itronsem01/init.c b/testsuites/itrontests/itronsem01/init.c
index 9ee9d21c10..302daa5a16 100644
--- a/testsuites/itrontests/itronsem01/init.c
+++ b/testsuites/itrontests/itronsem01/init.c
@@ -10,7 +10,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
@@ -51,20 +51,20 @@ void ITRON_Init( void )
 
   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" );
   pk_csem.sematr = 0;
   pk_csem.isemcnt = 3;
   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" );
   pk_csem.isemcnt = 0;
   pk_csem.maxsem  = 0;
   status = cre_sem( 1, &pk_csem );
-  assert( status == E_PAR );
+  rtems_test_assert( status == E_PAR );
 
   /*
    *  Now run through all the bad ID errors
@@ -74,37 +74,37 @@ void ITRON_Init( void )
   pk_csem.maxsem  = 3;
   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" );
   pk_csem.isemcnt = 2;
   pk_csem.maxsem  = 3;
   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" );
   pk_csem.isemcnt = 2;
   pk_csem.maxsem  = 3;
   pk_csem.sematr  = TA_TPRI;
   status = cre_sem( 2, &pk_csem );
-  assert( status == E_OK );
+  rtems_test_assert( status == E_OK );
 
   /*
    *  Generate all the bad id errors for del_sem
@@ -112,19 +112,19 @@ void ITRON_Init( void )
 
   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 );
 
   /*
    *  Generate all the bad id errors for sig_sem
@@ -132,19 +132,19 @@ void ITRON_Init( void )
 
   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 );
 
   /*
    *  Generate all the bad id errors for preq_sem
@@ -152,19 +152,19 @@ void ITRON_Init( void )
 
   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 );
 
   /*
    *  Generate all the bad id errors for wai_sem
@@ -172,19 +172,19 @@ void ITRON_Init( void )
 
   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 );
 
   /*
    *  Generate all the bad id errors for twai_sem
@@ -192,19 +192,19 @@ void ITRON_Init( void )
 
   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 );
 
   /*
    *  Generate all the bad id errors for ref_sem
@@ -212,19 +212,19 @@ void ITRON_Init( void )
 
   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 );
 
   /*
    *  Exercise preq_sem (and sig_sem a little)
@@ -233,27 +233,27 @@ void ITRON_Init( void )
 
   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 );
 
   /*
    *  Exercise twai_sem
@@ -262,7 +262,7 @@ void ITRON_Init( void )
   puts( "Init - twai_sem - semaphore 1 unavailable - 1 second E_TMOUT" );
   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" );
 
@@ -272,19 +272,19 @@ void ITRON_Init( void )
 
   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 );
 
   /*
    *  Exercise ref_sem
@@ -292,21 +292,21 @@ void ITRON_Init( void )
 
   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 );
 
   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 );
 
@@ -319,13 +319,13 @@ void ITRON_Init( void )
 
   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" );
 
   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" );
   rtems_test_exit( 0 );
diff --git a/testsuites/itrontests/itronsem01/system.h b/testsuites/itrontests/itronsem01/system.h
index 1a2222151f..5e468f266b 100644
--- a/testsuites/itrontests/itronsem01/system.h
+++ b/testsuites/itrontests/itronsem01/system.h
@@ -3,7 +3,7 @@
  *  This include file contains information that is included in every
  *  function in the test set.
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -15,7 +15,6 @@
 
 #include <tmacros.h>
 #include <rtems/itron.h>
-#include <assert.h>
 
 /* functions */
 
diff --git a/testsuites/itrontests/itrontask02/dormant.c b/testsuites/itrontests/itrontask02/dormant.c
index 42cab19dbc..24f60ac539 100644
--- a/testsuites/itrontests/itrontask02/dormant.c
+++ b/testsuites/itrontests/itrontask02/dormant.c
@@ -18,7 +18,6 @@
  *  $Id$
  */
 
-#include <assert.h>
 #include "system.h"
 
 void Dormant_task(void)
@@ -27,7 +26,7 @@ void Dormant_task(void)
   ext_tsk( );
 
   puts( "ERROR==>ext_tsk of DORMANT returned" );
-  assert(0);
+  rtems_test_assert(0);
 }
 
 
diff --git a/testsuites/itrontests/itrontask02/init.c b/testsuites/itrontests/itrontask02/init.c
index 6bff1fd82c..df2691bb23 100644
--- a/testsuites/itrontests/itrontask02/init.c
+++ b/testsuites/itrontests/itrontask02/init.c
@@ -10,7 +10,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
@@ -23,7 +23,6 @@
 #define CONFIGURE_INIT
 #include "system.h"
 #include <stdio.h>
-#include <assert.h>
 
 void ITRON_Init( void )
 {
@@ -331,7 +330,7 @@ void ITRON_Init( void )
   /*  Call from task independent portion to cause E_OBJ
   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 );
   */
 
   puts( "Init - chg_pri - task is DORMANT - E_OBJ" );
@@ -410,7 +409,7 @@ void ITRON_Init( void )
   /*  XXX Call from task independent portion to cause E_ID
   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 );
   */
 
   puts( "Init - ref_tsk - task does not exist - E_NOEXS" );
diff --git a/testsuites/itrontests/itrontask03/init.c b/testsuites/itrontests/itrontask03/init.c
index f7d0756a9c..1b204805d0 100644
--- a/testsuites/itrontests/itrontask03/init.c
+++ b/testsuites/itrontests/itrontask03/init.c
@@ -10,7 +10,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
@@ -23,7 +23,6 @@
 #define CONFIGURE_INIT
 #include "system.h"
 #include <stdio.h>
-#include <assert.h>
 
 void ITRON_Init( void )
 {
@@ -134,5 +133,5 @@ void ITRON_Init( void )
   directive_failed( status, "sta_tsk of TA3" );
 
   exd_tsk();
-  assert(0);
+  rtems_test_assert(0);
 }
diff --git a/testsuites/itrontests/itrontask03/preempt.c b/testsuites/itrontests/itrontask03/preempt.c
index e70936d857..0ff6101c23 100644
--- a/testsuites/itrontests/itrontask03/preempt.c
+++ b/testsuites/itrontests/itrontask03/preempt.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
@@ -17,7 +17,6 @@
  *  $Id$
  */
 
-#include <assert.h>
 #include "system.h"
 
 int Preempt_task_Count;
@@ -30,11 +29,11 @@ void Preempt_task()
   puts( "PREEMPT - ref_tsk validation"  );
   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 ) {
     Preempt_task_Count ++;
@@ -43,11 +42,11 @@ void Preempt_task()
     directive_failed( status, "chg_pri" );
     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 );
   }
 }