ada: Add standard test begin/end message

48 files changed, 97 insertions, 48 deletions

diff --git a/testsuites/ada/sptests/sp01/config.h b/testsuites/ada/sptests/sp01/config.h
index fc9f99dc68..ee9e0fbde5 100644
--- a/testsuites/ada/sptests/sp01/config.h
+++ b/testsuites/ada/sptests/sp01/config.h
@@ -23,6 +23,8 @@
 
 #define CONFIGURE_MAXIMUM_TASKS             4
 
+#define ADA_TEST_NAME "ADA SP 1"
+
 #include <rtems/confdefs.h>
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp01/sptest.adb b/testsuites/ada/sptests/sp01/sptest.adb
index 46e48e9b04..eb7497bd9d 100644
--- a/testsuites/ada/sptests/sp01/sptest.adb
+++ b/testsuites/ada/sptests/sp01/sptest.adb
@@ -38,7 +38,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 1 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       TIME := ( 1988, 12, 31, 9, 0, 0, 0 );
 
@@ -133,7 +133,7 @@ package body SPTEST is
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
 
          if TIME.SECOND >= 35 then
-            TEXT_IO.PUT_LINE( "*** END OF TEST 1 ***" );
+            TEST_SUPPORT.ADA_TEST_END;
             RTEMS.SHUTDOWN_EXECUTIVE( 0 );
          end if;
 
diff --git a/testsuites/ada/sptests/sp02/config.h b/testsuites/ada/sptests/sp02/config.h
index 84ec56ffd2..60f58c1c13 100644
--- a/testsuites/ada/sptests/sp02/config.h
+++ b/testsuites/ada/sptests/sp02/config.h
@@ -23,6 +23,8 @@
 
 #define CONFIGURE_MAXIMUM_TASKS             4
 
+#define ADA_TEST_NAME "ADA SP 2"
+
 #include <rtems/confdefs.h>
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp02/sptest.adb b/testsuites/ada/sptests/sp02/sptest.adb
index 45fb4ac5c2..4534d28d2e 100644
--- a/testsuites/ada/sptests/sp02/sptest.adb
+++ b/testsuites/ada/sptests/sp02/sptest.adb
@@ -37,7 +37,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 2 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.PREEMPT_TASK_NAME := RTEMS.BUILD_NAME(  'P', 'R', 'M', 'T' );
 
@@ -281,7 +281,7 @@ package body SPTEST is
       RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 2 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
    
    end TASK_1;
diff --git a/testsuites/ada/sptests/sp03/config.h b/testsuites/ada/sptests/sp03/config.h
index 37acc3c24d..0c7507a3c5 100644
--- a/testsuites/ada/sptests/sp03/config.h
+++ b/testsuites/ada/sptests/sp03/config.h
@@ -23,6 +23,8 @@
 
 #define CONFIGURE_MAXIMUM_TASKS             3
 
+#define ADA_TEST_NAME "ADA SP 3"
+
 #include <rtems/confdefs.h>
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp03/sptest.adb b/testsuites/ada/sptests/sp03/sptest.adb
index 24be47eb1c..1a05b51721 100644
--- a/testsuites/ada/sptests/sp03/sptest.adb
+++ b/testsuites/ada/sptests/sp03/sptest.adb
@@ -37,7 +37,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 3 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -154,7 +154,7 @@ package body SPTEST is
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
 
          if TIME.SECOND >= 17 then
-            TEXT_IO.PUT_LINE( "*** END OF TEST 3 ***" );
+            TEST_SUPPORT.ADA_TEST_END;
             RTEMS.SHUTDOWN_EXECUTIVE( 0 );
          end if;
 
diff --git a/testsuites/ada/sptests/sp04/config.h b/testsuites/ada/sptests/sp04/config.h
index bad5bcbeb8..8fccddb09a 100644
--- a/testsuites/ada/sptests/sp04/config.h
+++ b/testsuites/ada/sptests/sp04/config.h
@@ -26,6 +26,8 @@
 
 #define CONFIGURE_MAXIMUM_TASKS             4
 
+#define ADA_TEST_NAME "ADA SP 4"
+
 #include <rtems/confdefs.h>
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp04/sptest.adb b/testsuites/ada/sptests/sp04/sptest.adb
index f3955fbb3a..3fcaad18b3 100644
--- a/testsuites/ada/sptests/sp04/sptest.adb
+++ b/testsuites/ada/sptests/sp04/sptest.adb
@@ -79,7 +79,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 4 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       TIME := ( 1988, 12, 31, 9, 15, 0, 0 );
 
@@ -264,7 +264,7 @@ package body SPTEST is
                NULL;
             END LOOP;
             Flush_Task_Event_Log;
-            TEXT_IO.PUT_LINE( "*** END OF TEST 4 ***" );
+            TEST_SUPPORT.ADA_TEST_END;
             RTEMS.SHUTDOWN_EXECUTIVE( 0 );
 
          end if;
diff --git a/testsuites/ada/sptests/sp05/config.h b/testsuites/ada/sptests/sp05/config.h
index 8b7c68e412..d5ddc1d724 100644
--- a/testsuites/ada/sptests/sp05/config.h
+++ b/testsuites/ada/sptests/sp05/config.h
@@ -25,6 +25,8 @@
 
 #define CONFIGURE_MAXIMUM_TASKS             4
 
+#define ADA_TEST_NAME "ADA SP 5"
+
 #include <rtems/confdefs.h>
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp05/sptest.adb b/testsuites/ada/sptests/sp05/sptest.adb
index 1a9b974419..00e41e255d 100644
--- a/testsuites/ada/sptests/sp05/sptest.adb
+++ b/testsuites/ada/sptests/sp05/sptest.adb
@@ -36,7 +36,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 5 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -170,7 +170,7 @@ package body SPTEST is
           
       end loop;
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 5 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
 
    end TASK_1;
diff --git a/testsuites/ada/sptests/sp06/config.h b/testsuites/ada/sptests/sp06/config.h
index 8b7c68e412..492e0e68be 100644
--- a/testsuites/ada/sptests/sp06/config.h
+++ b/testsuites/ada/sptests/sp06/config.h
@@ -25,6 +25,8 @@
 
 #define CONFIGURE_MAXIMUM_TASKS             4
 
+#define ADA_TEST_NAME "ADA SP 6"
+
 #include <rtems/confdefs.h>
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp06/sptest.adb b/testsuites/ada/sptests/sp06/sptest.adb
index f19fd068ee..b3acf7b006 100644
--- a/testsuites/ada/sptests/sp06/sptest.adb
+++ b/testsuites/ada/sptests/sp06/sptest.adb
@@ -37,7 +37,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 6 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -132,7 +132,7 @@ package body SPTEST is
       PASS := ARGUMENT + 1;
 
       if PASS = 5 then
-         TEXT_IO.PUT_LINE( "*** END OF TEST 6 ***" );
+         TEST_SUPPORT.ADA_TEST_END;
          RTEMS.SHUTDOWN_EXECUTIVE( 0 );
       end if;
 
diff --git a/testsuites/ada/sptests/sp07/config.h b/testsuites/ada/sptests/sp07/config.h
index 4d2ef9f762..ffdac2d224 100644
--- a/testsuites/ada/sptests/sp07/config.h
+++ b/testsuites/ada/sptests/sp07/config.h
@@ -26,6 +26,8 @@
 
 #define CONFIGURE_MAXIMUM_TASKS             5
 
+#define ADA_TEST_NAME "ADA SP 7"
+
 #include <rtems/confdefs.h>
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp07/sptest.adb b/testsuites/ada/sptests/sp07/sptest.adb
index d55aa73bf8..e008336065 100644
--- a/testsuites/ada/sptests/sp07/sptest.adb
+++ b/testsuites/ada/sptests/sp07/sptest.adb
@@ -131,7 +131,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 7 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.EXTENSION_NAME( 1 ) := RTEMS.BUILD_NAME(  'E', 'X', 'T', ' ' );
 
@@ -419,7 +419,7 @@ package body SPTEST is
          TEXT_IO.PUT_LINE( "TASK_EXITTED - user extension invoked correctly" );
       end if;
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 7 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
 
    end TASK_EXIT_EXTENSION;
diff --git a/testsuites/ada/sptests/sp08/config.h b/testsuites/ada/sptests/sp08/config.h
index 98f7e89d49..af9175713c 100644
--- a/testsuites/ada/sptests/sp08/config.h
+++ b/testsuites/ada/sptests/sp08/config.h
@@ -25,6 +25,8 @@
 
 #define CONFIGURE_MAXIMUM_TASKS             2
 
+#define ADA_TEST_NAME "ADA SP 8"
+
 #include <rtems/confdefs.h>
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp08/sptest.adb b/testsuites/ada/sptests/sp08/sptest.adb
index 2bec479285..2a2e994e73 100644
--- a/testsuites/ada/sptests/sp08/sptest.adb
+++ b/testsuites/ada/sptests/sp08/sptest.adb
@@ -37,7 +37,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 8 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
 
@@ -339,7 +339,7 @@ package body SPTEST is
    
 -- END OF CURRENT MODE
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 8 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
    end TASK_1;
 
diff --git a/testsuites/ada/sptests/sp09/config.h b/testsuites/ada/sptests/sp09/config.h
index 0dac4eca54..4d96170ea0 100644
--- a/testsuites/ada/sptests/sp09/config.h
+++ b/testsuites/ada/sptests/sp09/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS              10
+
+#define ADA_TEST_NAME "ADA SP 9"
 #define CONFIGURE_MAXIMUM_TIMERS              1
 #define CONFIGURE_MAXIMUM_SEMAPHORES          2
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
diff --git a/testsuites/ada/sptests/sp09/sptest.adb b/testsuites/ada/sptests/sp09/sptest.adb
index 218fbaed49..e064ebef90 100644
--- a/testsuites/ada/sptests/sp09/sptest.adb
+++ b/testsuites/ada/sptests/sp09/sptest.adb
@@ -45,7 +45,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 9 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 )   := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 )   := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -2984,7 +2984,7 @@ package body SPTEST is
 
       SPTEST.SCREEN_14;
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 9 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
 
    end TASK_1;
diff --git a/testsuites/ada/sptests/sp11/config.h b/testsuites/ada/sptests/sp11/config.h
index 97513d5a29..508613e314 100644
--- a/testsuites/ada/sptests/sp11/config.h
+++ b/testsuites/ada/sptests/sp11/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS               3
+
+#define ADA_TEST_NAME "ADA SP 11"
 #define CONFIGURE_MAXIMUM_TIMERS              6
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
diff --git a/testsuites/ada/sptests/sp11/sptest.adb b/testsuites/ada/sptests/sp11/sptest.adb
index 95dd17846b..fa6e139367 100644
--- a/testsuites/ada/sptests/sp11/sptest.adb
+++ b/testsuites/ada/sptests/sp11/sptest.adb
@@ -40,7 +40,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 11 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -623,7 +623,7 @@ package body SPTEST is
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 200 ticks" );
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 11 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
 
    end TASK_1;
diff --git a/testsuites/ada/sptests/sp12/config.h b/testsuites/ada/sptests/sp12/config.h
index da366f9b85..8edb8baf90 100644
--- a/testsuites/ada/sptests/sp12/config.h
+++ b/testsuites/ada/sptests/sp12/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS               8
+
+#define ADA_TEST_NAME "ADA SP 12"
 #define CONFIGURE_MAXIMUM_SEMAPHORES         10
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
diff --git a/testsuites/ada/sptests/sp12/sptest.adb b/testsuites/ada/sptests/sp12/sptest.adb
index c1d9f627f8..a1391ab01d 100644
--- a/testsuites/ada/sptests/sp12/sptest.adb
+++ b/testsuites/ada/sptests/sp12/sptest.adb
@@ -38,7 +38,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 12 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -801,7 +801,7 @@ TEST_SUPPORT.PAUSE;
       );
       TEXT_IO.PUT_LINE( "TA5 - SM1 deleted by TA1" );
     
-      TEXT_IO.PUT_LINE( "*** END OF TEST 12 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
    
    end TASK_5;
diff --git a/testsuites/ada/sptests/sp13/config.h b/testsuites/ada/sptests/sp13/config.h
index d31a29d3f0..2d6dd34f1f 100644
--- a/testsuites/ada/sptests/sp13/config.h
+++ b/testsuites/ada/sptests/sp13/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS               4
+
+#define ADA_TEST_NAME "ADA SP 13"
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     10
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
diff --git a/testsuites/ada/sptests/sp13/sptest.adb b/testsuites/ada/sptests/sp13/sptest.adb
index 7b61b9e7ba..96b74618b7 100644
--- a/testsuites/ada/sptests/sp13/sptest.adb
+++ b/testsuites/ada/sptests/sp13/sptest.adb
@@ -43,7 +43,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 13 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -678,7 +678,7 @@ TEST_SUPPORT.PAUSE;
           TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "message_queue_delete" );
       end loop;
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 13 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
 
    end TASK_1;
diff --git a/testsuites/ada/sptests/sp14/config.h b/testsuites/ada/sptests/sp14/config.h
index 4a0cc4e0f2..2a53074581 100644
--- a/testsuites/ada/sptests/sp14/config.h
+++ b/testsuites/ada/sptests/sp14/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS               3
+
+#define ADA_TEST_NAME "ADA SP 14"
 #define CONFIGURE_MAXIMUM_TIMERS              1
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
diff --git a/testsuites/ada/sptests/sp14/sptest.adb b/testsuites/ada/sptests/sp14/sptest.adb
index 3b74c9f256..eb9ff3c34a 100644
--- a/testsuites/ada/sptests/sp14/sptest.adb
+++ b/testsuites/ada/sptests/sp14/sptest.adb
@@ -40,7 +40,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 14 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -277,7 +277,7 @@ package body SPTEST is
       RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER YIELD" );
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 14 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
 
    end TASK_2;
diff --git a/testsuites/ada/sptests/sp15/config.h b/testsuites/ada/sptests/sp15/config.h
index 35e7e3a81a..b0d535c347 100644
--- a/testsuites/ada/sptests/sp15/config.h
+++ b/testsuites/ada/sptests/sp15/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS               2
+
+#define ADA_TEST_NAME "ADA SP 15"
 #define CONFIGURE_MAXIMUM_PARTITIONS          2
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
diff --git a/testsuites/ada/sptests/sp15/sptest.adb b/testsuites/ada/sptests/sp15/sptest.adb
index 39e887dd2f..8f83defedf 100644
--- a/testsuites/ada/sptests/sp15/sptest.adb
+++ b/testsuites/ada/sptests/sp15/sptest.adb
@@ -37,7 +37,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 15 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
 
@@ -270,7 +270,7 @@ package body SPTEST is
       RTEMS.PARTITION.DELETE( SPTEST.PARTITION_ID( 2 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_DELETE OF SELF" );
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 15 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
    
    end TASK_1;
diff --git a/testsuites/ada/sptests/sp16/config.h b/testsuites/ada/sptests/sp16/config.h
index 4b5fae9b87..c50733678e 100644
--- a/testsuites/ada/sptests/sp16/config.h
+++ b/testsuites/ada/sptests/sp16/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS               4
+
+#define ADA_TEST_NAME "ADA SP 16"
 #define CONFIGURE_MAXIMUM_REGIONS             4
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
diff --git a/testsuites/ada/sptests/sp16/sptest.adb b/testsuites/ada/sptests/sp16/sptest.adb
index a62eedd104..44d65badfc 100644
--- a/testsuites/ada/sptests/sp16/sptest.adb
+++ b/testsuites/ada/sptests/sp16/sptest.adb
@@ -38,7 +38,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 16 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -530,7 +530,7 @@ TEST_SUPPORT.PAUSE;
       RTEMS.REGION.DELETE( SPTEST.REGION_ID( 4 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( status, "region_delete" );
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 16 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
 
    end TASK_1;
diff --git a/testsuites/ada/sptests/sp17/config.h b/testsuites/ada/sptests/sp17/config.h
index df15364ff6..9813e25d25 100644
--- a/testsuites/ada/sptests/sp17/config.h
+++ b/testsuites/ada/sptests/sp17/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS           3
+
+#define ADA_TEST_NAME "ADA SP 17"
 #define CONFIGURE_MICROSECONDS_PER_TICK   RTEMS_MILLISECONDS_TO_MICROSECONDS(25)
 #define CONFIGURE_TICKS_PER_TIMESLICE     1000
 
diff --git a/testsuites/ada/sptests/sp17/sptest.adb b/testsuites/ada/sptests/sp17/sptest.adb
index e2402a50cf..880f5db4a7 100644
--- a/testsuites/ada/sptests/sp17/sptest.adb
+++ b/testsuites/ada/sptests/sp17/sptest.adb
@@ -37,7 +37,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 17 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -136,7 +136,7 @@ package body SPTEST is
 
       TEXT_IO.PUT_LINE( "TA1 - Got Back!!!" );
      
-      TEXT_IO.PUT_LINE( "*** END OF TEST 17 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
    
    end TASK_1;
diff --git a/testsuites/ada/sptests/sp19/config.h b/testsuites/ada/sptests/sp19/config.h
index a3e24eeb42..1cdc8a05d2 100644
--- a/testsuites/ada/sptests/sp19/config.h
+++ b/testsuites/ada/sptests/sp19/config.h
@@ -23,6 +23,8 @@
 
 #define CONFIGURE_MAXIMUM_TASKS             7
 
+#define ADA_TEST_NAME "ADA SP 19"
+
 #include <rtems/confdefs.h>
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp19/sptest.adp b/testsuites/ada/sptests/sp19/sptest.adp
index d49bf41aac..4c36691e5d 100644
--- a/testsuites/ada/sptests/sp19/sptest.adp
+++ b/testsuites/ada/sptests/sp19/sptest.adp
@@ -38,7 +38,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 19 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -313,7 +313,7 @@ package body SPTEST is
             RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 3 ), STATUS );
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" );
  
-            TEXT_IO.PUT_LINE( "*** END OF TEST 19 ***" );
+            TEST_SUPPORT.ADA_TEST_END;
             RTEMS.SHUTDOWN_EXECUTIVE( 0 );
          end if;
 
diff --git a/testsuites/ada/sptests/sp20/config.h b/testsuites/ada/sptests/sp20/config.h
index a80d846356..f509a8163d 100644
--- a/testsuites/ada/sptests/sp20/config.h
+++ b/testsuites/ada/sptests/sp20/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS               7
+
+#define ADA_TEST_NAME "ADA SP 20"
 #define CONFIGURE_MAXIMUM_PERIODS             10
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/ada/sptests/sp20/sptest.adb b/testsuites/ada/sptests/sp20/sptest.adb
index 1929fd958f..e5ad87295c 100644
--- a/testsuites/ada/sptests/sp20/sptest.adb
+++ b/testsuites/ada/sptests/sp20/sptest.adb
@@ -39,7 +39,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 20 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
       SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
@@ -225,7 +225,7 @@ package body SPTEST is
                TEXT_IO.PUT_LINE( ")" );
  
                if PASS = 10 then
-                  TEXT_IO.PUT_LINE( "*** END OF TEST 20 ***" );
+                  TEST_SUPPORT.ADA_TEST_END;
                   RTEMS.SHUTDOWN_EXECUTIVE( 0 );
                end if;
 
diff --git a/testsuites/ada/sptests/sp22/config.h b/testsuites/ada/sptests/sp22/config.h
index acbcae6bdd..da60e49360 100644
--- a/testsuites/ada/sptests/sp22/config.h
+++ b/testsuites/ada/sptests/sp22/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS           2
+
+#define ADA_TEST_NAME "ADA SP 22"
 #define CONFIGURE_MAXIMUM_TIMERS          2
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/ada/sptests/sp22/sptest.adb b/testsuites/ada/sptests/sp22/sptest.adb
index a947628db5..3cf4baa2bd 100644
--- a/testsuites/ada/sptests/sp22/sptest.adb
+++ b/testsuites/ada/sptests/sp22/sptest.adb
@@ -40,7 +40,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 22 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       TIME := ( 1988, 12, 31, 9, 0, 0, 0 );
 
@@ -289,7 +289,7 @@ TEST_SUPPORT.PAUSE;
       RTEMS.TIMER.DELETE( TMID, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_DELETE" );
           
-      TEXT_IO.PUT_LINE( "*** END OF TEST 22 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
    
    end TASK_1;
diff --git a/testsuites/ada/sptests/sp23/config.h b/testsuites/ada/sptests/sp23/config.h
index ba9b9f5a24..5af9f6244d 100644
--- a/testsuites/ada/sptests/sp23/config.h
+++ b/testsuites/ada/sptests/sp23/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS           2
+
+#define ADA_TEST_NAME "ADA SP 23"
 #define CONFIGURE_MAXIMUM_PORTS           1
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/ada/sptests/sp23/sptest.adb b/testsuites/ada/sptests/sp23/sptest.adb
index e3a2871ab6..4e88421ec7 100644
--- a/testsuites/ada/sptests/sp23/sptest.adb
+++ b/testsuites/ada/sptests/sp23/sptest.adb
@@ -40,7 +40,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 23 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
 
@@ -167,7 +167,7 @@ package body SPTEST is
       RTEMS.PORT.DELETE( SPTEST.PORT_ID( 1 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_DELETE" );
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 23 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
 
    end TASK_1;
diff --git a/testsuites/ada/sptests/sp24/config.h b/testsuites/ada/sptests/sp24/config.h
index 7ed712a491..ee18ff3fac 100644
--- a/testsuites/ada/sptests/sp24/config.h
+++ b/testsuites/ada/sptests/sp24/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS               4
+
+#define ADA_TEST_NAME "ADA SP 24"
 #define CONFIGURE_MAXIMUM_TIMERS              3
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/ada/sptests/sp24/sptest.adb b/testsuites/ada/sptests/sp24/sptest.adb
index 4245036995..af255e4d73 100644
--- a/testsuites/ada/sptests/sp24/sptest.adb
+++ b/testsuites/ada/sptests/sp24/sptest.adb
@@ -39,7 +39,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 24 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       TIME := ( 1988, 12, 31, 9, 0, 0, 0 );
 
@@ -145,7 +145,7 @@ package body SPTEST is
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
 
          if TIME.SECOND >= 35 then
-            TEXT_IO.PUT_LINE( "*** END OF TEST 24 ***" );
+            TEST_SUPPORT.ADA_TEST_END;
             RTEMS.SHUTDOWN_EXECUTIVE( 0 );
          end if;
 
diff --git a/testsuites/ada/sptests/sp25/config.h b/testsuites/ada/sptests/sp25/config.h
index 9d6155f869..d7c6c19cb5 100644
--- a/testsuites/ada/sptests/sp25/config.h
+++ b/testsuites/ada/sptests/sp25/config.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS               2
+
+#define ADA_TEST_NAME "ADA SP 25"
 #define CONFIGURE_MAXIMUM_REGIONS             1
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/ada/sptests/sp25/sptest.adb b/testsuites/ada/sptests/sp25/sptest.adb
index 1fb103e966..1fff4c0cdb 100644
--- a/testsuites/ada/sptests/sp25/sptest.adb
+++ b/testsuites/ada/sptests/sp25/sptest.adb
@@ -37,7 +37,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 25 ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
 
@@ -354,7 +354,7 @@ TEST_SUPPORT.PAUSE;
       RTEMS.REGION.DELETE( SPTEST.REGION_ID( 1 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE OF RN1" );
 
-      TEXT_IO.PUT_LINE( "*** END OF TEST 25 ***" );
+      TEST_SUPPORT.ADA_TEST_END;
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );
 
    end TASK_1;
diff --git a/testsuites/ada/sptests/spatcb01/config.h b/testsuites/ada/sptests/spatcb01/config.h
index 530f0dddf8..dad989dbe4 100644
--- a/testsuites/ada/sptests/spatcb01/config.h
+++ b/testsuites/ada/sptests/spatcb01/config.h
@@ -13,4 +13,6 @@
 
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 1
 
+#define ADA_TEST_NAME "ADA SPATCB 1"
+
 #include <rtems/confdefs.h>
diff --git a/testsuites/ada/sptests/spatcb01/spatcb01.adb b/testsuites/ada/sptests/spatcb01/spatcb01.adb
index 19aaa8031f..810446f871 100644
--- a/testsuites/ada/sptests/spatcb01/spatcb01.adb
+++ b/testsuites/ada/sptests/spatcb01/spatcb01.adb
@@ -14,13 +14,14 @@
 --
 
 with TEXT_IO;
+with TEST_SUPPORT;
 with System.Task_Primitives.Operations;
 with System.Tasking;
 
 procedure SPATCB01 is
   Self_Id : constant System.Tasking.Task_Id := System.Task_Primitives.Operations.Self;
 begin
-  TEXT_IO.PUT_LINE( "*** BEGIN OF TEST SPATCB 1 ***" );
+  TEST_SUPPORT.ADA_TEST_BEGIN;
   TEXT_IO.PUT_LINE( Self_Id.Common.Task_Image( 1 .. Self_Id.Common.Task_Image_Len ) );
-  TEXT_IO.PUT_LINE( "*** END OF TEST SPATCB 1 ***" );
+  TEST_SUPPORT.ADA_TEST_END;
 end SPATCB01;
diff --git a/testsuites/ada/sptests/spname01/config.h b/testsuites/ada/sptests/spname01/config.h
index bab1fc5232..8316f41e0c 100644
--- a/testsuites/ada/sptests/spname01/config.h
+++ b/testsuites/ada/sptests/spname01/config.h
@@ -26,6 +26,8 @@
 
 #define CONFIGURE_MAXIMUM_TASKS              1
 
+#define ADA_TEST_NAME "ADA SPNAME 1"
+
 #include <rtems/confdefs.h>
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/spname01/sptest.adb b/testsuites/ada/sptests/spname01/sptest.adb
index 5dd78d8e4a..108ff3b999 100644
--- a/testsuites/ada/sptests/spname01/sptest.adb
+++ b/testsuites/ada/sptests/spname01/sptest.adb
@@ -33,7 +33,7 @@ package body SPTEST is
    begin
 
       TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** Ada Task Name TEST ***" );
+      TEST_SUPPORT.ADA_TEST_BEGIN;
 
       RTEMS.Object_Get_Name( RTEMS.Self, StringName, Pointer );
       if Pointer = RTEMS.Null_Address then
@@ -53,7 +53,7 @@ package body SPTEST is
          TEXT_IO.PUT_LINE( "My name is (" & StringName & ")" );
       end if;
 
-      TEXT_IO.PUT_LINE( "*** END OF Ada Task Name TEST ***" );
+      TEST_SUPPORT.ADA_TEST_END;
 
       RTEMS.SHUTDOWN_EXECUTIVE( 0 );