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

	* sp18/init.c, sp31/task1.c, sp43/init.c, sp63/init.c, sp64/init.c,
	spfatal10/testcase.h, spfatal11/testcase.h, spobjgetnext/init.c,
	spwkspace/init.c: Use rtems_test_assert() consistently instead of
	system assert(). rtems_test_assert() is designed to integrate into
	the RTEMS test suite infrastructure.

10 files changed, 62 insertions, 50 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 515f40c29e..226899fa7d 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-08	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* sp18/init.c, sp31/task1.c, sp43/init.c, sp63/init.c, sp64/init.c,
+	spfatal10/testcase.h, spfatal11/testcase.h, spobjgetnext/init.c,
+	spwkspace/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-04	Sebastian Huber <Sebastian.Huber@embedded-brains.de>
 
 	* sp31/sp31.scn, sp31/task1.c, spintrcritical17/init.c: New test
diff --git a/testsuites/sptests/sp18/init.c b/testsuites/sptests/sp18/init.c
index e894d0ae72..b8c3dab35d 100644
--- a/testsuites/sptests/sp18/init.c
+++ b/testsuites/sptests/sp18/init.c
@@ -26,13 +26,13 @@ rtems_task Init(
 
   puts( "Init - rtems_workspace_get_information - OK" );
   sb = rtems_workspace_get_information( &start );
-  assert( sb );
+  rtems_test_assert( sb );
 
   #if 0
     printf( "Init - workspace free = %d\n", start.Free.largest );
     printf( "Init - workspace free blocks = %d\n", start.Free.number );
   #endif
-  assert( start.Free.number == 1 );
+  rtems_test_assert( start.Free.number == 1 );
   stack_size = start.Free.largest;
 
   #if 0
@@ -60,9 +60,9 @@ rtems_task Init(
      * Verify heap is still in same shape if we couldn't allocate a task
      */
     sb = rtems_workspace_get_information( &info );
-    assert( sb );
-    assert( info.Free.largest == start.Free.largest );
-    assert( info.Free.number  == start.Free.number  );
+    rtems_test_assert( sb );
+    rtems_test_assert( info.Free.largest == start.Free.largest );
+    rtems_test_assert( info.Free.number  == start.Free.number  );
 
     stack_size -= 8;
     if ( stack_size <= RTEMS_MINIMUM_STACK_SIZE )
@@ -81,9 +81,9 @@ rtems_task Init(
 
   puts( "Init - verify workspace has same memory" );
   sb = rtems_workspace_get_information( &info );
-  assert( sb );
-  assert( info.Free.largest == start.Free.largest );
-  assert( info.Free.number  == start.Free.number  );
+  rtems_test_assert( sb );
+  rtems_test_assert( info.Free.largest == start.Free.largest );
+  rtems_test_assert( info.Free.number  == start.Free.number  );
 
   puts( "*** END OF TEST 18 ***" );
   rtems_test_exit(0);
diff --git a/testsuites/sptests/sp31/task1.c b/testsuites/sptests/sp31/task1.c
index 67f06f821a..4ad1de7d46 100644
--- a/testsuites/sptests/sp31/task1.c
+++ b/testsuites/sptests/sp31/task1.c
@@ -140,7 +140,7 @@ rtems_task Task_1(
     info.start_time + info.initial );
   printf( "Timer Server scheduled for %" PRIdWatchdog_Interval " ticks since boot\n",
     schedule_time() );
-  assert(  (info.start_time + info.initial) == schedule_time() );
+  rtems_test_assert(  (info.start_time + info.initial) == schedule_time() );
 
   puts( "TA1 - rtems_task_wake_after - 1 second" );
   status = rtems_task_wake_after( 1 * rtems_clock_get_ticks_per_second() );
@@ -157,7 +157,7 @@ rtems_task Task_1(
     info.start_time + info.initial );
   printf( "Timer Server scheduled for %" PRIdWatchdog_Interval " ticks since boot\n",
     schedule_time() );
-  assert(  (info.start_time + info.initial) == schedule_time() );
+  rtems_test_assert(  (info.start_time + info.initial) == schedule_time() );
 
   puts( "TA1 - rtems_timer_cancel - timer 1" );
   status = rtems_timer_cancel( tmid );
diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c
index 8d27658717..086bb503c6 100644
--- a/testsuites/sptests/sp43/init.c
+++ b/testsuites/sptests/sp43/init.c
@@ -270,24 +270,24 @@ rtems_task Init(
    */
 
   puts( "rtems_build_id - build an id to match init task" );
-  tmpId = rtems_build_id( OBJECTS_CLASSIC_API, OBJECTS_RTEMS_TASKS, 1, 1 ),
-  assert( tmpId == main_task );
+  tmpId = rtems_build_id( OBJECTS_CLASSIC_API, OBJECTS_RTEMS_TASKS, 1, 1 );
+  rtems_test_assert( tmpId == main_task );
 
   puts( "rtems_object_id_get_api - OK" );
   part = rtems_object_id_get_api( main_task );
-  assert( part == OBJECTS_CLASSIC_API );
+  rtems_test_assert( part == OBJECTS_CLASSIC_API );
 
   puts( "rtems_object_id_get_class - OK" );
   part = rtems_object_id_get_class( main_task );
-  assert( part == OBJECTS_RTEMS_TASKS );
+  rtems_test_assert( part == OBJECTS_RTEMS_TASKS );
 
   puts( "rtems_object_id_get_node - OK" );
   part = rtems_object_id_get_node( main_task );
-  assert( part == 1 );
+  rtems_test_assert( part == 1 );
 
   puts( "rtems_object_id_get_index - OK" );
   part = rtems_object_id_get_index( main_task );
-  assert( part == 1 );
+  rtems_test_assert( part == 1 );
 
   /*
    * Start another screen and do the API/Class min/max routines
diff --git a/testsuites/sptests/sp63/init.c b/testsuites/sptests/sp63/init.c
index c1d601177c..d461a4bf10 100644
--- a/testsuites/sptests/sp63/init.c
+++ b/testsuites/sptests/sp63/init.c
@@ -30,19 +30,19 @@ void test_case_one(void)
   puts( "Init - _Heap_Initialize (for test one) - OK" );
   heap_size = _Heap_Initialize( &Heap, Memory, sizeof(Memory), 8 );
   printf( "Init - Heap size=%" PRIu32 "\n", heap_size );
-  assert( heap_size );
+  rtems_test_assert( heap_size );
 
   puts( "Init - _Heap_Allocate - too large size (overflow)- not OK");
   ptr1 = _Heap_Allocate( &Heap, UINTPTR_MAX );
-  assert( !ptr1 );
+  rtems_test_assert( !ptr1 );
 
   puts( "Init - _Heap_Allocate_aligned - OK");
   ptr1 = _Heap_Allocate_aligned( &Heap, 64, 32 );
-  assert( ptr1 );
+  rtems_test_assert( ptr1 );
 
   puts( "Init - _Heap_Resize_block - OK");
   hc = _Heap_Resize_block( &Heap, ptr1, 4, &old, &avail );
-  assert( !hc );
+  rtems_test_assert( !hc );
 }
 
 /*
@@ -60,15 +60,15 @@ void test_case_two(void)
   puts( "\nInit - _Heap_Initialize (for test two) - OK" );
   heap_size = _Heap_Initialize( &Heap, Memory, sizeof(Memory), 8 );
   printf( "Init - Heap size=%" PRIu32 "\n", heap_size );
-  assert( heap_size );
+  rtems_test_assert( heap_size );
 
   puts( "Init - _Heap_Allocate_aligned - OK");
   ptr1 = _Heap_Allocate_aligned( &Heap, 64, 4 );
-  assert( ptr1 );
+  rtems_test_assert( ptr1 );
 
   puts( "Init - _Heap_Resize_block - OK");
   hc = _Heap_Resize_block( &Heap, ptr1, 56, &old, &avail );
-  assert( !hc );
+  rtems_test_assert( !hc );
 }
 
 /*
diff --git a/testsuites/sptests/sp64/init.c b/testsuites/sptests/sp64/init.c
index 0238134a3e..2db29a1f4c 100644
--- a/testsuites/sptests/sp64/init.c
+++ b/testsuites/sptests/sp64/init.c
@@ -42,13 +42,13 @@ rtems_task Init(
 
   puts( "Init - rtems_workspace_get_information - OK" );
   sb = rtems_workspace_get_information( &start );
-  assert( sb );
+  rtems_test_assert( sb );
 
   #if 0
     printf( "Init - workspace free = %d\n", start.Free.largest );
     printf( "Init - workspace free blocks = %d\n", start.Free.number );
   #endif
-  assert( start.Free.number == 1 );
+  rtems_test_assert( start.Free.number == 1 );
   to_alloc = start.Free.largest;
 
   /* find the largest we can actually allocate */
@@ -69,15 +69,15 @@ rtems_task Init(
    * Verify heap is still in same shape if we couldn't allocate a region
    */
   sb = rtems_workspace_get_information( &info );
-  assert( sb );
-  assert( info.Free.largest == start.Free.largest );
-  assert( info.Free.number  == start.Free.number  );
+  rtems_test_assert( sb );
+  rtems_test_assert( info.Free.largest == start.Free.largest );
+  rtems_test_assert( info.Free.number  == start.Free.number  );
 
   puts( "Init - rtems_region_create - auto-extend - RTEMS_UNSATISFIED" );
   while (1) {
 
     sb = rtems_workspace_allocate( to_alloc, &alloced );
-    assert( sb );
+    rtems_test_assert( sb );
 
     sc = rtems_region_create(
       rtems_build_name( 'R', 'N', '2', ' ' ),
@@ -107,9 +107,9 @@ rtems_task Init(
       printf( "Init - workspace free/blocks = %d/%d\n",
         info.Free.largest, info.Free.number );
     #endif
-    assert( sb );
-    assert( info.Free.largest == start.Free.largest );
-    assert( info.Free.number  == start.Free.number  );
+    rtems_test_assert( sb );
+    rtems_test_assert( info.Free.largest == start.Free.largest );
+    rtems_test_assert( info.Free.number  == start.Free.number  );
 
     to_alloc -= 8;
     if ( to_alloc == 0 )
@@ -124,7 +124,7 @@ rtems_task Init(
    */
   puts( "Init - rtems_region_delete - OK" );
   sc = rtems_region_delete( region2 );
-  assert( sc == 0 );
+  rtems_test_assert( sc == 0 );
 
   /*
    *  Although it is intuitive that after deleting the region the
@@ -139,9 +139,9 @@ rtems_task Init(
         printf( "Init - workspace free/blocks = %d/%d\n",
       info.Free.largest, info.Free.number );
     #endif
-    assert( sb );
-    assert( info.Free.largest == start.Free.largest );
-    assert( info.Free.number  == start.Free.number  );
+    rtems_test_assert( sb );
+    rtems_test_assert( info.Free.largest == start.Free.largest );
+    rtems_test_assert( info.Free.number  == start.Free.number  );
   #endif
 
   puts( "*** END OF TEST 64 ***" );
diff --git a/testsuites/sptests/spfatal10/testcase.h b/testsuites/sptests/spfatal10/testcase.h
index 7c2316878e..de82afc409 100644
--- a/testsuites/sptests/spfatal10/testcase.h
+++ b/testsuites/sptests/spfatal10/testcase.h
@@ -10,6 +10,8 @@
  *  $Id$
  */
 
+#include <assert.h>
+
 #define FATAL_ERROR_TEST_NAME            "10"
 #define FATAL_ERROR_DESCRIPTION          "asserting with non-NULL strings..."
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_RTEMS_API
diff --git a/testsuites/sptests/spfatal11/testcase.h b/testsuites/sptests/spfatal11/testcase.h
index deed297aee..c9f89d2bff 100644
--- a/testsuites/sptests/spfatal11/testcase.h
+++ b/testsuites/sptests/spfatal11/testcase.h
@@ -10,6 +10,8 @@
  *  $Id$
  */
 
+#include <assert.h>
+
 #define FATAL_ERROR_TEST_NAME            "11"
 #define FATAL_ERROR_DESCRIPTION          "asserting with non-NULL strings..."
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_RTEMS_API
diff --git a/testsuites/sptests/spobjgetnext/init.c b/testsuites/sptests/spobjgetnext/init.c
index 42fcb410c0..9c5161367b 100644
--- a/testsuites/sptests/spobjgetnext/init.c
+++ b/testsuites/sptests/spobjgetnext/init.c
@@ -74,27 +74,27 @@ rtems_task Init(
 
   puts( "Init - _Objects_Get_next - NULL object information" );
   o = _Objects_Get_next( NULL, main_task, &location, &id );
-  assert( o == NULL );
+  rtems_test_assert( o == NULL );
 
   puts( "Init - _Objects_Get_next - NULL location" );
   o = _Objects_Get_next( info, main_task, NULL, &id );
-  assert( o == NULL );
+  rtems_test_assert( o == NULL );
 
   puts( "Init - _Objects_Get_next - NULL id" );
   o = _Objects_Get_next( info, main_task, &location, NULL );
-  assert( o == NULL );
+  rtems_test_assert( o == NULL );
 
   /* XXX push the three NULL error cases */
 
   /* simple case of only all tasks in the system, starting at initial */
   count = scan_objects( info, OBJECTS_ID_INITIAL_INDEX );
   printf( "%d RTEMS Task%s\n", count, ((count == 1) ? "" : "s") );
-  assert( count == 1 );
+  rtems_test_assert( count == 1 );
 
   /* simple case of only 1 task in the system, starting at that task */
   count = scan_objects( info, main_task );
   printf( "%d RTEMS Task%s\n", count, ((count == 1) ? "" : "s") );
-  assert( count == 1 );
+  rtems_test_assert( count == 1 );
 
   /* XXX create >= 1 task and make sure the counts are correct when */
   /* XXX you start the search at initial, first id, arbitrary id */
diff --git a/testsuites/sptests/spwkspace/init.c b/testsuites/sptests/spwkspace/init.c
index fb316d61ff..9dbbe9a112 100644
--- a/testsuites/sptests/spwkspace/init.c
+++ b/testsuites/sptests/spwkspace/init.c
@@ -26,36 +26,36 @@ rtems_task Init(
 
   puts( "rtems_workspace_get_information - null pointer" );
   retbool = rtems_workspace_get_information( NULL );
-  assert( retbool == false );
+  rtems_test_assert( retbool == false );
 
   puts( "rtems_workspace_get_information - OK" );
   retbool = rtems_workspace_get_information( &info );
-  assert( retbool == true );
+  rtems_test_assert( retbool == true );
 
   puts( "rtems_workspace_allocate - null pointer" );
   retbool = rtems_workspace_allocate( 42, NULL );
-  assert( retbool == false );
+  rtems_test_assert( retbool == false );
 
   puts( "rtems_workspace_allocate - 0 bytes" );
   retbool = rtems_workspace_allocate( 0, &p1 );
-  assert( retbool == false );
+  rtems_test_assert( retbool == false );
 
   puts( "rtems_workspace_allocate - too many bytes" );
   retbool = rtems_workspace_allocate( info.Free.largest * 2, &p1 );
-  assert( retbool == false );
+  rtems_test_assert( retbool == false );
 
   puts( "rtems_workspace_allocate - 42 bytes" );
   retbool = rtems_workspace_allocate( 42, &p1 );
-  assert( retbool == true );
-  assert( p1 != NULL );
+  rtems_test_assert( retbool == true );
+  rtems_test_assert( p1 != NULL );
 
   puts( "rtems_workspace_free - NULL" );
   retbool = rtems_workspace_free( NULL );
-  assert( retbool == false );
+  rtems_test_assert( retbool == false );
 
   puts( "rtems_workspace_free - previous pointer to 42 bytes" );
   retbool = rtems_workspace_free( p1 );
-  assert( retbool == true );
+  rtems_test_assert( retbool == true );
 
   puts( "*** END OF TEST WORKSPACE CLASSIC API ***" );
   rtems_test_exit( 0 );