2009-12-08 Joel Sherrill <joel.sherrill@oarcorp.com>

	* block01/init.c, block02/init.c, block03/init.c, block04/init.c,
	block05/init.c, block07/init.c, bspcmdline01/init.c,
	stringto01/init.c, stringto01/stringto_test_template.h,
	termios01/init.c, termios01/termios_testdriver.c, termios02/init.c:
	Use rtems_test_assert() consistently instead of system assert().
	rtems_test_assert() is designed to integrate into the RTEMS test
	suite infrastructure.

13 files changed, 89 insertions, 82 deletions

diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog
index c8efe3d2c4..aa3c4d6dec 100644
--- a/testsuites/libtests/ChangeLog
+++ b/testsuites/libtests/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-08	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* block01/init.c, block02/init.c, block03/init.c, block04/init.c,
+	block05/init.c, block07/init.c, bspcmdline01/init.c,
+	stringto01/init.c, stringto01/stringto_test_template.h,
+	termios01/init.c, termios01/termios_testdriver.c, termios02/init.c:
+	Use rtems_test_assert() consistently instead of system assert().
+	rtems_test_assert() is designed to integrate into the RTEMS test
+	suite infrastructure.
+
 2009-12-06      Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* POSIX/Makefile.am: Add readv, writev.
diff --git a/testsuites/libtests/block01/init.c b/testsuites/libtests/block01/init.c
index 067f883738..44df881ff2 100644
--- a/testsuites/libtests/block01/init.c
+++ b/testsuites/libtests/block01/init.c
@@ -22,15 +22,15 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
+#include "tmacros.h"
 
 #include <rtems.h>
 #include <rtems/ramdisk.h>
 #include <rtems/diskdevs.h>
 
-#define ASSERT_SC(sc) assert((sc) == RTEMS_SUCCESSFUL)
+#define ASSERT_SC(sc) rtems_test_assert((sc) == RTEMS_SUCCESSFUL)
 
-#define ASSERT_SC_EQ(sc, sc_expected) assert((sc) == (sc_expected))
+#define ASSERT_SC_EQ(sc, sc_expected) rtems_test_assert((sc) == (sc_expected))
 
 #define BLOCK_SIZE 512U
 
@@ -51,7 +51,7 @@ static void test_diskdevs(void)
   dev_t const big_minor_dev = rtems_filesystem_make_dev_t(0, (rtems_device_minor_number) -2);
   ramdisk *const rd = ramdisk_allocate(NULL, BLOCK_SIZE, BLOCK_COUNT, false);
 
-  assert(rd != NULL);
+  rtems_test_assert(rd != NULL);
 
   sc = rtems_disk_io_initialize();
   ASSERT_SC(sc);
@@ -127,13 +127,13 @@ static void test_diskdevs(void)
   ASSERT_SC(sc);
 
   physical_dd = rtems_disk_obtain(physical_dev);
-  assert(physical_dd != NULL && physical_dd->uses == 2);
+  rtems_test_assert(physical_dd != NULL && physical_dd->uses == 2);
 
   sc = rtems_disk_release(physical_dd);
   ASSERT_SC(sc);
 
   logical_dd = rtems_disk_obtain(logical_dev);
-  assert(logical_dd != NULL && logical_dd->uses == 1);
+  rtems_test_assert(logical_dd != NULL && logical_dd->uses == 1);
 
   sc = rtems_disk_delete(physical_dev);
   ASSERT_SC(sc);
@@ -142,10 +142,10 @@ static void test_diskdevs(void)
   ASSERT_SC_EQ(sc, RTEMS_RESOURCE_IN_USE);
 
   dd = rtems_disk_obtain(physical_dev);
-  assert(dd == NULL);
+  rtems_test_assert(dd == NULL);
 
   dd = rtems_disk_obtain(logical_dev);
-  assert(dd == NULL);
+  rtems_test_assert(dd == NULL);
 
   sc = rtems_disk_release(logical_dd);
   ASSERT_SC(sc);
diff --git a/testsuites/libtests/block02/init.c b/testsuites/libtests/block02/init.c
index 903f9ac161..186787a26b 100644
--- a/testsuites/libtests/block02/init.c
+++ b/testsuites/libtests/block02/init.c
@@ -19,14 +19,14 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#include <assert.h>
+#include "tmacros.h"
 
 #include <rtems.h>
 #include <rtems/ramdisk.h>
 #include <rtems/bdbuf.h>
 #include <rtems/diskdevs.h>
 
-#define ASSERT_SC(sc) assert((sc) == RTEMS_SUCCESSFUL)
+#define ASSERT_SC(sc) rtems_test_assert((sc) == RTEMS_SUCCESSFUL)
 
 #define PRIORITY_INIT 10
 
@@ -59,18 +59,18 @@ static void task_low(rtems_task_argument arg)
   rtems_status_code sc = RTEMS_SUCCESSFUL;
   rtems_bdbuf_buffer *bd = NULL;
 
-  assert(!sync_done);
+  rtems_test_assert(!sync_done);
 
   printk("L: try access: A0\n");
 
   sc = rtems_bdbuf_get(dev_a, 0, &bd);
   ASSERT_SC(sc);
 
-  assert(sync_done);
+  rtems_test_assert(sync_done);
 
   printk("L: access: A0\n");
 
-  assert(bd->dev == dev_a);
+  rtems_test_assert(bd->dev == dev_a);
 
   printk("*** END OF TEST BLOCK 2 ***\n");
 
@@ -82,14 +82,14 @@ static void task_high(rtems_task_argument arg)
   rtems_status_code sc = RTEMS_SUCCESSFUL;
   rtems_bdbuf_buffer *bd = NULL;
 
-  assert(!sync_done);
+  rtems_test_assert(!sync_done);
 
   printk("H: try access: A0\n");
 
   sc = rtems_bdbuf_get(dev_a, 0, &bd);
   ASSERT_SC(sc);
 
-  assert(sync_done);
+  rtems_test_assert(sync_done);
 
   printk("H: access: A0\n");
 
diff --git a/testsuites/libtests/block03/init.c b/testsuites/libtests/block03/init.c
index cfaa4f1fbd..f79f482c42 100644
--- a/testsuites/libtests/block03/init.c
+++ b/testsuites/libtests/block03/init.c
@@ -19,14 +19,14 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#include <assert.h>
+#include "tmacros.h"
 
 #include <rtems.h>
 #include <rtems/ramdisk.h>
 #include <rtems/bdbuf.h>
 #include <rtems/diskdevs.h>
 
-#define ASSERT_SC(sc) assert((sc) == RTEMS_SUCCESSFUL)
+#define ASSERT_SC(sc) rtems_test_assert((sc) == RTEMS_SUCCESSFUL)
 
 #define PRIORITY_INIT 10
 
@@ -53,18 +53,18 @@ static void task_low(rtems_task_argument arg)
   rtems_status_code sc = RTEMS_SUCCESSFUL;
   rtems_bdbuf_buffer *bd = NULL;
 
-  assert(!sync_done);
+  rtems_test_assert(!sync_done);
 
   printk("L: try access: 0\n");
 
   sc = rtems_bdbuf_get(dev, 0, &bd);
   ASSERT_SC(sc);
 
-  assert(sync_done);
+  rtems_test_assert(sync_done);
 
   printk("L: access: 0\n");
 
-  assert(bd->block == 0);
+  rtems_test_assert(bd->block == 0);
 
   printk("*** END OF TEST BLOCK 3 ***\n");
 
@@ -76,14 +76,14 @@ static void task_high(rtems_task_argument arg)
   rtems_status_code sc = RTEMS_SUCCESSFUL;
   rtems_bdbuf_buffer *bd = NULL;
 
-  assert(!sync_done);
+  rtems_test_assert(!sync_done);
 
   printk("H: try access: 0\n");
 
   sc = rtems_bdbuf_get(dev, 0, &bd);
   ASSERT_SC(sc);
 
-  assert(sync_done);
+  rtems_test_assert(sync_done);
 
   printk("H: access: 0\n");
 
diff --git a/testsuites/libtests/block04/init.c b/testsuites/libtests/block04/init.c
index 122c24742b..a7bda26dee 100644
--- a/testsuites/libtests/block04/init.c
+++ b/testsuites/libtests/block04/init.c
@@ -19,14 +19,14 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#include <assert.h>
+#include "tmacros.h"
 
 #include <rtems.h>
 #include <rtems/ramdisk.h>
 #include <rtems/bdbuf.h>
 #include <rtems/diskdevs.h>
 
-#define ASSERT_SC(sc) assert((sc) == RTEMS_SUCCESSFUL)
+#define ASSERT_SC(sc) rtems_test_assert((sc) == RTEMS_SUCCESSFUL)
 
 #define PRIORITY_INIT 10
 
@@ -66,7 +66,7 @@ static void task_low(rtems_task_argument arg)
 
   printk("L: sync done: 0\n");
 
-  assert(false);
+  rtems_test_assert(false);
 }
 
 static void task_high(rtems_task_argument arg)
diff --git a/testsuites/libtests/block05/init.c b/testsuites/libtests/block05/init.c
index 4c3d1ac112..f26f3cb269 100644
--- a/testsuites/libtests/block05/init.c
+++ b/testsuites/libtests/block05/init.c
@@ -19,7 +19,7 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#include <assert.h>
+#include "tmacros.h"
 #include <stdarg.h>
 #include <errno.h>
 
@@ -27,7 +27,7 @@
 #include <rtems/bdbuf.h>
 #include <rtems/diskdevs.h>
 
-#define ASSERT_SC(sc) assert((sc) == RTEMS_SUCCESSFUL)
+#define ASSERT_SC(sc) rtems_test_assert((sc) == RTEMS_SUCCESSFUL)
 
 #define PRIORITY_INIT 1
 
@@ -164,7 +164,7 @@ static rtems_bdbuf_buffer *get(enum get_type type, enum blk_kind kind)
       bds_per_group = 1;
       break;
     default:
-      assert(false);
+      rtems_test_assert(false);
       break;
   }
 
@@ -176,12 +176,12 @@ static rtems_bdbuf_buffer *get(enum get_type type, enum blk_kind kind)
       get_bd = rtems_bdbuf_read;
       break;
     default:
-      assert(false);
+      rtems_test_assert(false);
       break;
   }
 
   sc = (*get_bd)(dev, blk_index, &bd);
-  assert(
+  rtems_test_assert(
     sc == RTEMS_SUCCESSFUL
       && bd->dev == dev
       && bd->block == blk_index
@@ -207,7 +207,7 @@ static void rel(rtems_bdbuf_buffer *bd, enum rel_type type)
       rel_bd = rtems_bdbuf_sync;
       break;
     default:
-      assert(false);
+      rtems_test_assert(false);
       break;
   }
 
@@ -266,7 +266,7 @@ static void task_resume(rtems_task_argument arg)
         do_resume = finish_low && finish_high;
         break;
       default:
-        assert(false);
+        rtems_test_assert(false);
         break;
     }
 
@@ -310,7 +310,7 @@ static void execute_test(unsigned i)
   ASSERT_SC(sc);
 
   sc = rtems_bdbuf_get(dev_b, 0, &bd);
-  assert(sc == RTEMS_SUCCESSFUL && bd->dev == dev_b && bd->block == 0);
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL && bd->dev == dev_b && bd->block == 0);
 
   sc = rtems_bdbuf_release(bd);
   ASSERT_SC(sc);
@@ -323,7 +323,7 @@ static void execute_test(unsigned i)
       suspend = false;
       break;
     default:
-      assert(false);
+      rtems_test_assert(false);
       break;
   }
 
diff --git a/testsuites/libtests/block07/init.c b/testsuites/libtests/block07/init.c
index b232120271..bc25e03c88 100644
--- a/testsuites/libtests/block07/init.c
+++ b/testsuites/libtests/block07/init.c
@@ -23,14 +23,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <assert.h>
+#include "tmacros.h"
 
 #include <rtems.h>
 #include <rtems/ramdisk.h>
 #include <rtems/bdbuf.h>
 #include <rtems/diskdevs.h>
 
-#define ASSERT_SC(sc) assert((sc) == RTEMS_SUCCESSFUL)
+#define ASSERT_SC(sc) rtems_test_assert((sc) == RTEMS_SUCCESSFUL)
 
 #define PRIORITY_INIT 1
 
@@ -64,13 +64,13 @@ static void change_block_size(void)
   uint32_t new_block_size = BLOCK_SIZE_B;
   int fd = open("/dev/rda", O_RDWR);
 
-  assert(fd >= 0);
+  rtems_test_assert(fd >= 0);
 
   rv = ioctl(fd, RTEMS_BLKIO_SETBLKSIZE, &new_block_size);
-  assert(rv == 0);
+  rtems_test_assert(rv == 0);
 
   rv = close(fd);
-  assert(rv == 0);
+  rtems_test_assert(rv == 0);
 }
 
 static void task_low(rtems_task_argument arg)
@@ -85,7 +85,7 @@ static void task_low(rtems_task_argument arg)
 
   printk("L: access: 0\n");
 
-  assert(bd->group->bds_per_group == 2);
+  rtems_test_assert(bd->group->bds_per_group == 2);
 
   printk("L: release: 0\n");
 
@@ -111,7 +111,7 @@ static void task_mid(rtems_task_argument arg)
 
   printk("M: access: 0\n");
 
-  assert(bd->group->bds_per_group == 1);
+  rtems_test_assert(bd->group->bds_per_group == 1);
 
   printk("M: release: 0\n");
 
@@ -137,7 +137,7 @@ static void task_high(rtems_task_argument arg)
 
   printk("H: access: 0\n");
 
-  assert(bd->group->bds_per_group == 1);
+  rtems_test_assert(bd->group->bds_per_group == 1);
 
   printk("H: release: 0\n");
 
diff --git a/testsuites/libtests/bspcmdline01/init.c b/testsuites/libtests/bspcmdline01/init.c
index 84553f520b..143701f175 100644
--- a/testsuites/libtests/bspcmdline01/init.c
+++ b/testsuites/libtests/bspcmdline01/init.c
@@ -23,30 +23,30 @@ void test_errors(void)
 
   puts( "rtems_bsp_cmdline_get_param - name=NULL - returns NULL" );
   p = rtems_bsp_cmdline_get_param( NULL, result, 32 );
-  assert( p == NULL );
+  rtems_test_assert( p == NULL );
 
   puts( "rtems_bsp_cmdline_get_param - result=NULL - returns NULL" );
   p = rtems_bsp_cmdline_get_param( "name", NULL, 32 );
-  assert( p == NULL );
+  rtems_test_assert( p == NULL );
 
   puts( "rtems_bsp_cmdline_get_param - length=0 - returns NULL" );
   p = rtems_bsp_cmdline_get_param( "name", result, 0 );
-  assert( p == NULL );
+  rtems_test_assert( p == NULL );
 
   puts( "rtems_bsp_cmdline_get_param_raw - name=NULL - returns NULL" );
   p = rtems_bsp_cmdline_get_param_raw( NULL );
-  assert( p == NULL );
+  rtems_test_assert( p == NULL );
 
   bsp_boot_cmdline = NULL;
 
   puts( "rtems_bsp_cmdline_get_param - bsp_boot_cmdline=NULL - returns NULL" );
   p = rtems_bsp_cmdline_get_param( "name", result, 5 );
-  assert( p == NULL );
+  rtems_test_assert( p == NULL );
 
   puts(
     "rtems_bsp_cmdline_get_param_raw - bsp_boot_cmdline=NULL - returns NULL" );
   p = rtems_bsp_cmdline_get_param_raw( "name" );
-  assert( p == NULL );
+  rtems_test_assert( p == NULL );
 }
 
 void test_search(
@@ -77,14 +77,14 @@ void test_search(
       puts( "ERROR - rtems_bsp_cmdline_get_param_raw did not return NULL" );
     else
       printf( "rtems_bsp_cmdline_get_param_raw(%s) returned NULL\n", param );
-    assert( !p );
+    rtems_test_assert( !p );
   } else {
     if ( p )
       printf( "rtems_bsp_cmdline_get_param_raw(%s) returned (%s)\n", param, p );
     else
       printf( "rtems_bsp_cmdline_get_param_raw(%s) returned NULL\n", param );
 
-    assert( p );
+    rtems_test_assert( p );
   }
 
   printf( "rtems_bsp_cmdline_get_param_rhs(%s)\n", param );
@@ -95,11 +95,11 @@ void test_search(
       puts( "ERROR - rtems_bsp_cmdline_get_param_rhs did not return NULL" );
     else
       printf( "rtems_bsp_cmdline_get_param_rhs(%s) returned NULL\n", param );
-    assert( !p );
+    rtems_test_assert( !p );
   } else {
     if ( !p )
       puts( "ERROR - rtems_bsp_cmdline_get_param_rhs returned NULL" );
-    assert( p );
+    rtems_test_assert( p );
     printf(
       "rtems_bsp_cmdline_get_param_rhs(%s) returned (%s) value=(%s)\n",
       param,
diff --git a/testsuites/libtests/stringto01/init.c b/testsuites/libtests/stringto01/init.c
index b8ba4e00a7..38fbda8d0f 100644
--- a/testsuites/libtests/stringto01/init.c
+++ b/testsuites/libtests/stringto01/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
@@ -13,7 +13,6 @@
 #include <rtems/stringto.h>
 
 #include <stdio.h>
-#include <assert.h>
 
 /* Test pointer conversions */
 #define TEST_STRING_TO_TYPE          void *
diff --git a/testsuites/libtests/stringto01/stringto_test_template.h b/testsuites/libtests/stringto01/stringto_test_template.h
index a351b5d964..70f8e0321a 100644
--- a/testsuites/libtests/stringto01/stringto_test_template.h
+++ b/testsuites/libtests/stringto01/stringto_test_template.h
@@ -43,7 +43,7 @@ void TEST_STRING_TO_NAME(void)
   #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT)
     status = STRING_TO_NAME_METHOD( GOOD_VALUE_STRING, NULL, &endptr );
   #endif
-  assert( status == RTEMS_INVALID_ADDRESS );
+  rtems_test_assert( status == RTEMS_INVALID_ADDRESS );
 
   /* Basic conversion works for return value, return end pointer */
   puts(
@@ -55,8 +55,8 @@ void TEST_STRING_TO_NAME(void)
   #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT)
     status = STRING_TO_NAME_METHOD( GOOD_VALUE_STRING, &value, NULL );
   #endif
-  assert( status == RTEMS_SUCCESSFUL );
-  assert( value == (TEST_STRING_TO_TYPE)GOOD_VALUE );
+  rtems_test_assert( status == RTEMS_SUCCESSFUL );
+  rtems_test_assert( value == (TEST_STRING_TO_TYPE)GOOD_VALUE );
 
   /* Basic conversion works for return value */
   endptr = NULL;
@@ -69,9 +69,9 @@ void TEST_STRING_TO_NAME(void)
   #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT)
     status = STRING_TO_NAME_METHOD( GOOD_VALUE_STRING, &value, &endptr );
   #endif
-  assert( status == RTEMS_SUCCESSFUL );
-  assert( endptr );
-  assert( value == (TEST_STRING_TO_TYPE)GOOD_VALUE );
+  rtems_test_assert( status == RTEMS_SUCCESSFUL );
+  rtems_test_assert( endptr );
+  rtems_test_assert( value == (TEST_STRING_TO_TYPE)GOOD_VALUE );
 
   /* Bad conversion works for return value */
   endptr = NULL;
@@ -84,8 +84,8 @@ void TEST_STRING_TO_NAME(void)
   #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT)
     status = STRING_TO_NAME_METHOD( BAD_VALUE_STRING, &value, &endptr );
   #endif
-  assert( status == RTEMS_NOT_DEFINED );
-  assert( endptr );
+  rtems_test_assert( status == RTEMS_NOT_DEFINED );
+  rtems_test_assert( endptr );
 
   /* Conversion of empty string */
   endptr = NULL;
@@ -99,9 +99,9 @@ void TEST_STRING_TO_NAME(void)
   #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT)
     status = STRING_TO_NAME_METHOD( "", &value, &endptr );
   #endif
-  assert( status == RTEMS_NOT_DEFINED );
-  assert( endptr );
-  assert( value == (TEST_STRING_TO_TYPE)0 );
+  rtems_test_assert( status == RTEMS_NOT_DEFINED );
+  rtems_test_assert( endptr );
+  rtems_test_assert( value == (TEST_STRING_TO_TYPE)0 );
 
   /* Conversion of number that is too large */
   #if defined(TEST_TOO_LARGE_STRING)
@@ -117,8 +117,8 @@ void TEST_STRING_TO_NAME(void)
     #endif
     if ( status != RTEMS_INVALID_NUMBER )
       printf( "ERROR = %s\n", rtems_status_text(status) );
-    assert( status == RTEMS_INVALID_NUMBER );
-    assert( endptr );
+    rtems_test_assert( status == RTEMS_INVALID_NUMBER );
+    rtems_test_assert( endptr );
   #endif
 
   /* Conversion of number that is too small */
@@ -132,8 +132,8 @@ void TEST_STRING_TO_NAME(void)
     #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT)
       status = STRING_TO_NAME_METHOD( TEST_TOO_SMALL_STRING, &value, &endptr );
     #endif
-    assert( status == RTEMS_INVALID_NUMBER );
-    assert( endptr );
+    rtems_test_assert( status == RTEMS_INVALID_NUMBER );
+    rtems_test_assert( endptr );
   #endif
 }
 
diff --git a/testsuites/libtests/termios01/init.c b/testsuites/libtests/termios01/init.c
index bf8fc59664..7dd72861f8 100644
--- a/testsuites/libtests/termios01/init.c
+++ b/testsuites/libtests/termios01/init.c
@@ -10,7 +10,6 @@
  */
 
 #include "tmacros.h"
-#include <assert.h>
 #include <termios.h>
 #include <rtems/termiostypes.h>
 #include <fcntl.h>
@@ -129,11 +128,11 @@ void test_termios_baud2index(void)
   );
   puts( "termios_baud_to_index(-2) - NOT OK" );
   i = rtems_termios_baud_to_index( -2 );
-  assert ( i == -1 );
+  rtems_test_assert( i == -1 );
 
   puts( "termios_baud_to_index(572) - NOT OK" );
   i = rtems_termios_baud_to_index( -2 );
-  assert ( i == -1 );
+  rtems_test_assert( i == -1 );
 
   if ( i != -1 )
   for (i=0 ; baud_table[i].constant != -1 ; i++ ) {
@@ -160,11 +159,11 @@ void test_termios_baud2number(void)
   );
   puts( "termios_baud_to_number(-2) - NOT OK" );
   i = rtems_termios_baud_to_number( -2 );
-  assert ( i == -1 );
+  rtems_test_assert( i == -1 );
 
   puts( "termios_baud_to_number(572) - NOT OK" );
   i = rtems_termios_baud_to_number( -2 );
-  assert ( i == -1 );
+  rtems_test_assert( i == -1 );
 
   for (i=0 ; baud_table[i].constant != -1 ; i++ ) {
     printf( "termios_baud_to_number(B%" PRIdrtems_termios_baud_t ") - OK\n", baud_table[i].baud );
@@ -194,11 +193,11 @@ void test_termios_number_to_baud(void)
   );
   puts( "termios_number_to_baud(-2) - NOT OK" );
   i = rtems_termios_number_to_baud( -2 );
-  assert ( i == -1 );
+  rtems_test_assert( i == -1 );
 
   puts( "termios_number_to_baud(572) - NOT OK" );
   i = rtems_termios_number_to_baud( -2 );
-  assert ( i == -1 );
+  rtems_test_assert( i == -1 );
 
   for (i=0 ; baud_table[i].constant != -1 ; i++ ) {
     printf( "termios_number_to_baud(B%" PRIdrtems_termios_baud_t ") - OK\n", baud_table[i].baud );
diff --git a/testsuites/libtests/termios01/termios_testdriver.c b/testsuites/libtests/termios01/termios_testdriver.c
index 49e96edb25..8658a8d44d 100644
--- a/testsuites/libtests/termios01/termios_testdriver.c
+++ b/testsuites/libtests/termios01/termios_testdriver.c
@@ -14,7 +14,6 @@
 #include "tmacros.h"
 #include <rtems/libio.h>
 #include <stdlib.h>
-#include <assert.h>
 #include <termios.h>
 #include <rtems/termiostypes.h>
 #include "termios_testdriver.h"
diff --git a/testsuites/libtests/termios02/init.c b/testsuites/libtests/termios02/init.c
index 7c4dc3aa35..2ab305c816 100644
--- a/testsuites/libtests/termios02/init.c
+++ b/testsuites/libtests/termios02/init.c
@@ -23,20 +23,20 @@ rtems_task Init(
 
   printf( "tcdrain(12) - EBADF\n" );
   sc = tcdrain(12);
-  assert( sc == -1 );
-  assert( errno == EBADF );
+  rtems_test_assert( sc == -1 );
+  rtems_test_assert( errno == EBADF );
 
   printf( "tcdrain(stdin) - OK\n" );
   sc = tcdrain(0);
-  assert( !sc );
+  rtems_test_assert( !sc );
 
   printf( "tcdrain(stdout) - OK\n" );
   tcdrain(1);
-  assert( !sc );
+  rtems_test_assert( !sc );
 
   printf( "tcdrain(stderr) - OK\n" );
   tcdrain(2);
-  assert( !sc );
+  rtems_test_assert( !sc );
 
   printf( "*** END OF TERMIOS 02 TEST ***\n" );
   exit( 0 );