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.

2 files changed, 6 insertions, 8 deletions

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"