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.

1 files changed, 9 insertions, 9 deletions

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;
   }