[rtems commit] tests/sptests: Use <rtems/test.h>

Sebastian Huber sebh at rtems.org
Tue Mar 25 08:25:24 UTC 2014


Module:    rtems
Branch:    master
Commit:    6c0301daad418d362f71eaa7e5c4b6a2d948fc50
Changeset: http://git.rtems.org/rtems/commit/?id=6c0301daad418d362f71eaa7e5c4b6a2d948fc50

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Mar 25 08:06:21 2014 +0100

tests/sptests: Use <rtems/test.h>

---

 testsuites/sptests/sp01/init.c                   |    4 +++-
 testsuites/sptests/sp01/system.h                 |    2 ++
 testsuites/sptests/sp01/task1.c                  |    2 +-
 testsuites/sptests/sp02/init.c                   |    4 +++-
 testsuites/sptests/sp02/system.h                 |    2 ++
 testsuites/sptests/sp02/task1.c                  |    2 +-
 testsuites/sptests/sp03/init.c                   |    4 +++-
 testsuites/sptests/sp03/system.h                 |    2 ++
 testsuites/sptests/sp03/task2.c                  |    2 +-
 testsuites/sptests/sp04/init.c                   |    4 +++-
 testsuites/sptests/sp04/system.h                 |    2 ++
 testsuites/sptests/sp04/task1.c                  |    2 +-
 testsuites/sptests/sp05/init.c                   |    4 +++-
 testsuites/sptests/sp05/system.h                 |    2 ++
 testsuites/sptests/sp05/task1.c                  |    2 +-
 testsuites/sptests/sp06/init.c                   |    4 +++-
 testsuites/sptests/sp06/system.h                 |    2 ++
 testsuites/sptests/sp06/task1.c                  |    2 +-
 testsuites/sptests/sp07/init.c                   |    4 +++-
 testsuites/sptests/sp07/system.h                 |    2 ++
 testsuites/sptests/sp07/taskexit.c               |    2 +-
 testsuites/sptests/sp08/init.c                   |    8 ++++++--
 testsuites/sptests/sp09/init.c                   |    4 +++-
 testsuites/sptests/sp09/system.h                 |    2 ++
 testsuites/sptests/sp09/task1.c                  |    2 +-
 testsuites/sptests/sp10/init.c                   |    8 ++++++--
 testsuites/sptests/sp11/init.c                   |    4 +++-
 testsuites/sptests/sp11/system.h                 |    2 ++
 testsuites/sptests/sp11/task1.c                  |    2 +-
 testsuites/sptests/sp12/init.c                   |    4 +++-
 testsuites/sptests/sp12/system.h                 |    2 ++
 testsuites/sptests/sp12/task5.c                  |    2 +-
 testsuites/sptests/sp13/init.c                   |    4 +++-
 testsuites/sptests/sp13/system.h                 |    2 ++
 testsuites/sptests/sp13/task1.c                  |    2 +-
 testsuites/sptests/sp14/init.c                   |    4 +++-
 testsuites/sptests/sp14/system.h                 |    2 ++
 testsuites/sptests/sp14/task2.c                  |    2 +-
 testsuites/sptests/sp15/init.c                   |    4 +++-
 testsuites/sptests/sp15/system.h                 |    2 ++
 testsuites/sptests/sp15/task1.c                  |    2 +-
 testsuites/sptests/sp16/init.c                   |    4 +++-
 testsuites/sptests/sp16/system.h                 |    2 ++
 testsuites/sptests/sp16/task1.c                  |    2 +-
 testsuites/sptests/sp17/init.c                   |    4 +++-
 testsuites/sptests/sp17/system.h                 |    2 ++
 testsuites/sptests/sp17/task1.c                  |    2 +-
 testsuites/sptests/sp18/init.c                   |    8 ++++++--
 testsuites/sptests/sp19/fptask.c                 |    2 +-
 testsuites/sptests/sp19/init.c                   |    4 +++-
 testsuites/sptests/sp19/system.h                 |    2 ++
 testsuites/sptests/sp20/init.c                   |    4 +++-
 testsuites/sptests/sp20/system.h                 |    2 ++
 testsuites/sptests/sp20/task1.c                  |    2 +-
 testsuites/sptests/sp2038/init.c                 |    8 ++++++--
 testsuites/sptests/sp21/init.c                   |    8 ++++++--
 testsuites/sptests/sp22/init.c                   |    4 +++-
 testsuites/sptests/sp22/system.h                 |    2 ++
 testsuites/sptests/sp22/task1.c                  |    2 +-
 testsuites/sptests/sp23/init.c                   |    4 +++-
 testsuites/sptests/sp23/system.h                 |    2 ++
 testsuites/sptests/sp23/task1.c                  |    2 +-
 testsuites/sptests/sp24/init.c                   |    4 +++-
 testsuites/sptests/sp24/system.h                 |    2 ++
 testsuites/sptests/sp24/task1.c                  |    2 +-
 testsuites/sptests/sp25/init.c                   |    4 +++-
 testsuites/sptests/sp25/system.h                 |    2 ++
 testsuites/sptests/sp25/task1.c                  |    2 +-
 testsuites/sptests/sp26/init.c                   |    3 ++-
 testsuites/sptests/sp26/system.h                 |    2 ++
 testsuites/sptests/sp26/task1.c                  |    2 +-
 testsuites/sptests/sp27/init.c                   |    8 ++++++--
 testsuites/sptests/sp28/init.c                   |    8 ++++++--
 testsuites/sptests/sp29/init.c                   |    8 ++++++--
 testsuites/sptests/sp30/init.c                   |    4 +++-
 testsuites/sptests/sp30/system.h                 |    2 ++
 testsuites/sptests/sp30/task1.c                  |    2 +-
 testsuites/sptests/sp31/init.c                   |    4 +++-
 testsuites/sptests/sp31/system.h                 |    2 ++
 testsuites/sptests/sp31/task1.c                  |    2 +-
 testsuites/sptests/sp32/init.c                   |    8 ++++++--
 testsuites/sptests/sp33/init.c                   |    8 ++++++--
 testsuites/sptests/sp34/changepri.c              |    8 ++++++--
 testsuites/sptests/sp35/priinv.c                 |    8 ++++++--
 testsuites/sptests/sp36/strict_order_mut.c       |    2 ++
 testsuites/sptests/sp37/init.c                   |    6 ++++--
 testsuites/sptests/sp37/system.h                 |    2 ++
 testsuites/sptests/sp38/init.c                   |    6 ++++--
 testsuites/sptests/sp38/system.h                 |    2 ++
 testsuites/sptests/sp39/init.c                   |    6 ++++--
 testsuites/sptests/sp39/system.h                 |    2 ++
 testsuites/sptests/sp40/init.c                   |    8 ++++++--
 testsuites/sptests/sp41/init.c                   |    8 ++++++--
 testsuites/sptests/sp42/init.c                   |    8 ++++++--
 testsuites/sptests/sp43/init.c                   |    6 ++++--
 testsuites/sptests/sp43/system.h                 |    2 ++
 testsuites/sptests/sp44/init.c                   |    8 ++++++--
 testsuites/sptests/sp45/init.c                   |    8 ++++++--
 testsuites/sptests/sp46/init.c                   |    8 ++++++--
 testsuites/sptests/sp47/init.c                   |    8 ++++++--
 testsuites/sptests/sp48/init.c                   |    8 ++++++--
 testsuites/sptests/sp49/init.c                   |    8 ++++++--
 testsuites/sptests/sp50/init.c                   |    8 ++++++--
 testsuites/sptests/sp51/init.c                   |    8 ++++++--
 testsuites/sptests/sp52/init.c                   |    8 ++++++--
 testsuites/sptests/sp54/init.c                   |    6 ++++--
 testsuites/sptests/sp55/init.c                   |    8 ++++++--
 testsuites/sptests/sp56/init.c                   |    8 ++++++--
 testsuites/sptests/sp57/init.c                   |    8 ++++++--
 testsuites/sptests/sp58/init.c                   |    8 ++++++--
 testsuites/sptests/sp59/init.c                   |    8 ++++++--
 testsuites/sptests/sp60/init.c                   |    8 ++++++--
 testsuites/sptests/sp62/init.c                   |    8 ++++++--
 testsuites/sptests/sp63/init.c                   |    8 ++++++--
 testsuites/sptests/sp64/init.c                   |    8 ++++++--
 testsuites/sptests/sp65/init.c                   |    8 ++++++--
 testsuites/sptests/sp67/init.c                   |    8 ++++++--
 testsuites/sptests/sp68/init.c                   |    8 ++++++--
 testsuites/sptests/sp69/init.c                   |    8 ++++++--
 testsuites/sptests/sp70/init.c                   |    8 ++++++--
 testsuites/sptests/sp71/init.c                   |    8 ++++++--
 testsuites/sptests/sp72/init.c                   |    8 ++++++--
 testsuites/sptests/sp73/init.c                   |    8 ++++++--
 testsuites/sptests/sp74/init.c                   |    8 ++++++--
 testsuites/sptests/sp75/init.c                   |    8 ++++++--
 testsuites/sptests/sp76/init.c                   |    8 ++++++--
 testsuites/sptests/sp77/init.c                   |    8 ++++++--
 testsuites/sptests/spassoc01/init.c              |    8 ++++++--
 testsuites/sptests/spcache01/init.c              |    8 ++++++--
 testsuites/sptests/spcbssched01/init.c           |    4 +++-
 testsuites/sptests/spcbssched01/system.h         |    2 ++
 testsuites/sptests/spcbssched01/task1.c          |    2 +-
 testsuites/sptests/spcbssched02/init.c           |    6 ++++--
 testsuites/sptests/spcbssched02/system.h         |    2 ++
 testsuites/sptests/spcbssched03/init.c           |    4 +++-
 testsuites/sptests/spcbssched03/system.h         |    2 ++
 testsuites/sptests/spcbssched03/tasks_periodic.c |    2 +-
 testsuites/sptests/spchain/init.c                |    8 ++++++--
 testsuites/sptests/spclock_err02/init.c          |    8 ++++++--
 testsuites/sptests/spclockget/init.c             |    8 ++++++--
 testsuites/sptests/spcontext01/init.c            |    8 ++++++--
 testsuites/sptests/spcoverage/init.c             |    8 ++++++--
 testsuites/sptests/spcpucounter01/init.c         |    8 ++++++--
 testsuites/sptests/spcpuset01/init.c             |    9 +++++----
 testsuites/sptests/spcpuset01/system.h           |    2 ++
 testsuites/sptests/spedfsched01/init.c           |    4 +++-
 testsuites/sptests/spedfsched01/system.h         |    2 ++
 testsuites/sptests/spedfsched01/task1.c          |    2 +-
 testsuites/sptests/spedfsched02/init.c           |    4 +++-
 testsuites/sptests/spedfsched02/system.h         |    2 ++
 testsuites/sptests/spedfsched02/task1.c          |    2 +-
 testsuites/sptests/spedfsched03/init.c           |    4 +++-
 testsuites/sptests/spedfsched03/system.h         |    2 ++
 testsuites/sptests/spedfsched03/tasks_periodic.c |    2 +-
 testsuites/sptests/sperror01/init.c              |    6 +++++-
 testsuites/sptests/sperror02/init.c              |    6 +++++-
 testsuites/sptests/sperror03/init.c              |    6 +++++-
 testsuites/sptests/speventsystem01/init.c        |    8 ++++++--
 testsuites/sptests/speventtransient01/init.c     |    8 ++++++--
 testsuites/sptests/spfatal03/testcase.h          |    2 --
 testsuites/sptests/spfatal16/testcase.h          |    4 +++-
 testsuites/sptests/spfatal26/init.c              |   10 +++++++---
 testsuites/sptests/spfatal_support/init.c        |    6 ++++--
 testsuites/sptests/spfatal_support/system.h      |    4 +++-
 testsuites/sptests/spfifo01/init.c               |    8 ++++++--
 testsuites/sptests/spfifo02/init.c               |    8 ++++++--
 testsuites/sptests/spfifo03/init.c               |    8 ++++++--
 testsuites/sptests/spfifo04/init.c               |    8 ++++++--
 testsuites/sptests/spfifo05/init.c               |    8 ++++++--
 testsuites/sptests/spfreechain01/init.c          |    8 ++++++--
 testsuites/sptests/spheapprot/init.c             |   11 +++++++++--
 testsuites/sptests/spinternalerror01/init.c      |   12 +++++++++---
 testsuites/sptests/spinternalerror02/init.c      |    8 ++++++--
 testsuites/sptests/spintrcritical01/init.c       |   18 +++++++++++-------
 testsuites/sptests/spintrcritical06/init.c       |   12 ++++++++----
 testsuites/sptests/spintrcritical08/init.c       |    8 ++++++--
 testsuites/sptests/spintrcritical09/init.c       |    8 ++++++--
 testsuites/sptests/spintrcritical10/init.c       |    8 ++++++--
 testsuites/sptests/spintrcritical11/init.c       |    8 ++++++--
 testsuites/sptests/spintrcritical13/init.c       |    8 ++++++--
 testsuites/sptests/spintrcritical15/init.c       |    9 ++++++---
 testsuites/sptests/spintrcritical16/init.c       |   10 ++++++----
 testsuites/sptests/spintrcritical17/init.c       |    8 ++++++--
 testsuites/sptests/spintrcritical18/init.c       |    8 +++++---
 testsuites/sptests/spintrcritical19/init.c       |    8 +++++---
 testsuites/sptests/spintrcritical20/init.c       |    8 +++++---
 testsuites/sptests/spmkdir/init.c                |    8 ++++++--
 testsuites/sptests/spmountmgr01/init.c           |    8 ++++++--
 testsuites/sptests/spnotepad01/init.c            |    8 ++++++--
 testsuites/sptests/spnsext01/init.c              |    8 ++++++--
 testsuites/sptests/spobjgetnext/init.c           |    6 ++++--
 testsuites/sptests/spobjgetnext/system.h         |    2 ++
 testsuites/sptests/sppagesize/init.c             |    8 ++++++--
 testsuites/sptests/sppartition_err01/init.c      |    6 ++++--
 testsuites/sptests/sppartition_err01/system.h    |    2 ++
 testsuites/sptests/spprintk/init.c               |    2 ++
 testsuites/sptests/spprivenv01/init.c            |    8 ++++++--
 testsuites/sptests/spprofiling01/init.c          |    6 ++++--
 testsuites/sptests/spqreslib/init.c              |    4 +++-
 testsuites/sptests/spqreslib/system.h            |    2 ++
 testsuites/sptests/spqreslib/task_periodic.c     |    2 +-
 testsuites/sptests/sprbtree01/init.c             |    8 ++++++--
 testsuites/sptests/spregion_err01/init.c         |    6 ++++--
 testsuites/sptests/spregion_err01/system.h       |    2 ++
 testsuites/sptests/spsem01/init.c                |    8 ++++++--
 testsuites/sptests/spsem02/init.c                |    8 ++++++--
 testsuites/sptests/spsimplesched01/init.c        |    8 ++++++--
 testsuites/sptests/spsimplesched02/init.c        |    8 ++++++--
 testsuites/sptests/spsimplesched03/init.c        |    8 ++++++--
 testsuites/sptests/spsize/init.c                 |    6 ++++--
 testsuites/sptests/spsize/system.h               |    2 ++
 testsuites/sptests/spstkalloc/init.c             |    8 ++++++--
 testsuites/sptests/spstkalloc02/init.c           |   10 +++++++---
 testsuites/sptests/spthreadq01/init.c            |    8 ++++++--
 testsuites/sptests/sptimer_err01/init.c          |    8 ++++++--
 testsuites/sptests/sptimer_err02/init.c          |    8 ++++++--
 testsuites/sptests/sptimespec01/init.c           |    8 ++++++--
 testsuites/sptests/sptls01/init.c                |    8 ++++++--
 testsuites/sptests/sptls02/init.cc               |    9 +++++++--
 testsuites/sptests/sptls03/init.c                |    8 ++++++--
 testsuites/sptests/spwatchdog/init.c             |    4 +++-
 testsuites/sptests/spwatchdog/system.h           |    2 ++
 testsuites/sptests/spwatchdog/task1.c            |    2 +-
 testsuites/sptests/spwkspace/init.c              |    8 ++++++--
 224 files changed, 896 insertions(+), 313 deletions(-)

diff --git a/testsuites/sptests/sp01/init.c b/testsuites/sptests/sp01/init.c
index dd514a4..4d73804 100644
--- a/testsuites/sptests/sp01/init.c
+++ b/testsuites/sptests/sp01/init.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 1";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -22,7 +24,7 @@ rtems_task Init(
   rtems_status_code status;
   rtems_id          id;
 
-  puts( "\n\n*** TEST 1 ***" );
+  TEST_BEGIN();
 
   build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
   status = rtems_clock_set( &time );
diff --git a/testsuites/sptests/sp01/system.h b/testsuites/sptests/sp01/system.h
index c3d8df2..a317dd9 100644
--- a/testsuites/sptests/sp01/system.h
+++ b/testsuites/sptests/sp01/system.h
@@ -24,6 +24,8 @@ rtems_task Task_1_through_3(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp01/task1.c b/testsuites/sptests/sp01/task1.c
index d4d804f..dcf2ba0 100644
--- a/testsuites/sptests/sp01/task1.c
+++ b/testsuites/sptests/sp01/task1.c
@@ -32,7 +32,7 @@ rtems_task Task_1_through_3(
     directive_failed( status, "rtems_clock_get_tod" );
 
     if ( time.second >= 35 ) {
-      puts( "*** END OF TEST 1 ***" );
+      TEST_END();
       rtems_test_exit( 0 );
     }
 
diff --git a/testsuites/sptests/sp02/init.c b/testsuites/sptests/sp02/init.c
index a3ca776..d7ff317 100644
--- a/testsuites/sptests/sp02/init.c
+++ b/testsuites/sptests/sp02/init.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 2";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -21,7 +23,7 @@ rtems_task Init(
   rtems_status_code status;
   rtems_id          preempt_task_id;
 
-  puts( "\n\n*** TEST 2 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     rtems_build_name( 'P', 'R', 'M', 'T' ),
diff --git a/testsuites/sptests/sp02/system.h b/testsuites/sptests/sp02/system.h
index c515f42..c9fcd3e 100644
--- a/testsuites/sptests/sp02/system.h
+++ b/testsuites/sptests/sp02/system.h
@@ -36,6 +36,8 @@ rtems_task Task_3(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_TASKS             4
 
diff --git a/testsuites/sptests/sp02/task1.c b/testsuites/sptests/sp02/task1.c
index bf74964..6abed24 100644
--- a/testsuites/sptests/sp02/task1.c
+++ b/testsuites/sptests/sp02/task1.c
@@ -63,6 +63,6 @@ rtems_task Task_1(
   status = rtems_task_wake_after( 5 * rtems_clock_get_ticks_per_second() );
   directive_failed( status, "rtems_task_wake_after" );
 
-  puts( "*** END OF TEST 2 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp03/init.c b/testsuites/sptests/sp03/init.c
index 9479311..1f02eb6 100644
--- a/testsuites/sptests/sp03/init.c
+++ b/testsuites/sptests/sp03/init.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 3";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -21,7 +23,7 @@ rtems_task Init(
   rtems_status_code status;
   rtems_id          id;
 
-  puts( "\n\n*** TEST 3 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     rtems_build_name( 'T', 'A', '1', ' ' ),
diff --git a/testsuites/sptests/sp03/system.h b/testsuites/sptests/sp03/system.h
index b6c967d..5db5cd5 100644
--- a/testsuites/sptests/sp03/system.h
+++ b/testsuites/sptests/sp03/system.h
@@ -28,6 +28,8 @@ rtems_task Task_2(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (1 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp03/task2.c b/testsuites/sptests/sp03/task2.c
index b17735e..9e33c2b 100644
--- a/testsuites/sptests/sp03/task2.c
+++ b/testsuites/sptests/sp03/task2.c
@@ -32,7 +32,7 @@ rtems_task Task_2(
     directive_failed( status, "rtems_clock_get_tod" );
 
     if ( time.second >= 17 ) {
-      puts( "*** END OF TEST 3 *** " );
+      TEST_END();
       rtems_test_exit( 0 );
     }
 
diff --git a/testsuites/sptests/sp04/init.c b/testsuites/sptests/sp04/init.c
index 439149e..e7bc793 100644
--- a/testsuites/sptests/sp04/init.c
+++ b/testsuites/sptests/sp04/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 4";
+
 rtems_extensions_table Extensions = {
   NULL,                      /* task create user extension */
   NULL,                      /* task start user extension */
@@ -44,7 +46,7 @@ rtems_task Init(
   rtems_status_code status;
   rtems_time_of_day time;
 
-  puts( "\n\n*** TEST 4 ***" );
+  TEST_BEGIN();
   build_time( &time, 12, 31, 1988, 9, 15, 0, 0 );
 
   status = rtems_clock_set( &time );
diff --git a/testsuites/sptests/sp04/system.h b/testsuites/sptests/sp04/system.h
index b8ac943..b770ff2 100644
--- a/testsuites/sptests/sp04/system.h
+++ b/testsuites/sptests/sp04/system.h
@@ -44,6 +44,8 @@ void Task_switch(
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS     1
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (3 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp04/task1.c b/testsuites/sptests/sp04/task1.c
index 2cb2717..364e09c 100644
--- a/testsuites/sptests/sp04/task1.c
+++ b/testsuites/sptests/sp04/task1.c
@@ -117,7 +117,7 @@ rtems_task Task_1(
       status = rtems_extension_delete( Extension_id[1] );
       directive_failed( status, "rtems_extension_delete" );
 
-      puts( "*** END OF TEST 4 ***" );
+      TEST_END();
       rtems_test_exit (0);
     }
   }
diff --git a/testsuites/sptests/sp05/init.c b/testsuites/sptests/sp05/init.c
index 0eced9c..7d95ee9 100644
--- a/testsuites/sptests/sp05/init.c
+++ b/testsuites/sptests/sp05/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 5";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 5 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp05/system.h b/testsuites/sptests/sp05/system.h
index 20f5a89..40491af 100644
--- a/testsuites/sptests/sp05/system.h
+++ b/testsuites/sptests/sp05/system.h
@@ -38,6 +38,8 @@ rtems_task Task_3(
 
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_TASKS             4
 
diff --git a/testsuites/sptests/sp05/task1.c b/testsuites/sptests/sp05/task1.c
index 1b36c01..b529768 100644
--- a/testsuites/sptests/sp05/task1.c
+++ b/testsuites/sptests/sp05/task1.c
@@ -74,6 +74,6 @@ rtems_task Task_1(
     directive_failed( status, "rtems_task_resume" );
   }
 
-  puts( "*** END OF TEST 5 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp06/init.c b/testsuites/sptests/sp06/init.c
index b9006ff..e8379ae 100644
--- a/testsuites/sptests/sp06/init.c
+++ b/testsuites/sptests/sp06/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 6";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -33,7 +35,7 @@ rtems_task Init(
   rtems_status_code   status;
   rtems_task_priority previous_priority;
 
-  puts( "\n\n*** TEST 6 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp06/system.h b/testsuites/sptests/sp06/system.h
index 1bf54ca..7590d08 100644
--- a/testsuites/sptests/sp06/system.h
+++ b/testsuites/sptests/sp06/system.h
@@ -38,6 +38,8 @@ rtems_task Task_3(
 
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_TASKS             4
 
diff --git a/testsuites/sptests/sp06/task1.c b/testsuites/sptests/sp06/task1.c
index e482e69..cc66000 100644
--- a/testsuites/sptests/sp06/task1.c
+++ b/testsuites/sptests/sp06/task1.c
@@ -34,7 +34,7 @@ rtems_task Task_1(
   pass = argument + 1;
 
   if ( pass == 5 ) {
-    puts( "*** END OF TEST 6 ***" );
+    TEST_END();
     rtems_test_exit( 0 );
   }
 
diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c
index e70b29f..8622b4c 100644
--- a/testsuites/sptests/sp07/init.c
+++ b/testsuites/sptests/sp07/init.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 7";
+
 static void Task_harmless_extension_one(
   rtems_tcb *unused_one
 )
@@ -66,7 +68,7 @@ rtems_task Init(
   rtems_status_code status;
   rtems_id          id;
 
-  puts( "\n\n*** TEST 7 ***" );
+  TEST_BEGIN();
 
   buffered_io_initialize();
 
diff --git a/testsuites/sptests/sp07/system.h b/testsuites/sptests/sp07/system.h
index e604a2f..b09912f 100644
--- a/testsuites/sptests/sp07/system.h
+++ b/testsuites/sptests/sp07/system.h
@@ -77,6 +77,8 @@ void Task_exit_extension(
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS     2
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp07/taskexit.c b/testsuites/sptests/sp07/taskexit.c
index 8468762..6066038 100644
--- a/testsuites/sptests/sp07/taskexit.c
+++ b/testsuites/sptests/sp07/taskexit.c
@@ -29,6 +29,6 @@ void Task_exit_extension(
     put_name( Task_name[ task_number( running_task->Object.id ) ], TRUE );
   }
 
-  puts("*** END OF TEST 7 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp08/init.c b/testsuites/sptests/sp08/init.c
index 44d826f..77e9819 100644
--- a/testsuites/sptests/sp08/init.c
+++ b/testsuites/sptests/sp08/init.c
@@ -15,6 +15,8 @@
 
 #include <rtems/score/sysstate.h>
 
+const char rtems_test_name[] = "SP 8";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -31,7 +33,7 @@ rtems_task Init(
   rtems_mode        previous_mode;
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 8 ***" );
+  TEST_BEGIN();
 
 /* BEGINNING OF RTEMS_ASR */
 
@@ -285,7 +287,7 @@ rtems_task Init(
 
 /* END OF TEST BEING IN A SYSTEM STATE OTHER THAN UP */
 
-  puts( "*** END OF TEST 8 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -294,6 +296,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp09/init.c b/testsuites/sptests/sp09/init.c
index 60a320a..3c5aadf 100644
--- a/testsuites/sptests/sp09/init.c
+++ b/testsuites/sptests/sp09/init.c
@@ -14,13 +14,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 9";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 9 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ]       =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ]       =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp09/system.h b/testsuites/sptests/sp09/system.h
index 55b5099..812868d 100644
--- a/testsuites/sptests/sp09/system.h
+++ b/testsuites/sptests/sp09/system.h
@@ -82,6 +82,8 @@ void Screen10( void );
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS     0
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (20 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp09/task1.c b/testsuites/sptests/sp09/task1.c
index 30318b4..0f58de6 100644
--- a/testsuites/sptests/sp09/task1.c
+++ b/testsuites/sptests/sp09/task1.c
@@ -54,6 +54,6 @@ rtems_task Task_1(
 
   Screen10();
 
-  puts( "*** END OF TEST 9 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp10/init.c b/testsuites/sptests/sp10/init.c
index a6460b7..c11172c 100644
--- a/testsuites/sptests/sp10/init.c
+++ b/testsuites/sptests/sp10/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 10";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -22,7 +24,7 @@ rtems_task Init(
 {
   bool                  is_set;
 
-  puts( "\n\n*** TEST 10 ***" );
+  TEST_BEGIN();
 
   puts( "Init - clear debug level" );
   _Debug_Level = 0;
@@ -47,7 +49,7 @@ rtems_task Init(
   is_set = rtems_debug_is_enabled( 0x1 );
   rtems_test_assert(is_set == false);
 
-  puts( "*** END OF TEST 10 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -57,6 +59,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS         1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp11/init.c b/testsuites/sptests/sp11/init.c
index c11ef1e..ee3f2e8 100644
--- a/testsuites/sptests/sp11/init.c
+++ b/testsuites/sptests/sp11/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 11";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 11 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp11/system.h b/testsuites/sptests/sp11/system.h
index 6553a1f..c76fa6b 100644
--- a/testsuites/sptests/sp11/system.h
+++ b/testsuites/sptests/sp11/system.h
@@ -71,6 +71,8 @@ rtems_timer_service_routine TA2_send_10_to_self(
 #define CONFIGURE_MAXIMUM_TIMERS              6
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (2 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp11/task1.c b/testsuites/sptests/sp11/task1.c
index 6e03a0b..60e5693 100644
--- a/testsuites/sptests/sp11/task1.c
+++ b/testsuites/sptests/sp11/task1.c
@@ -442,6 +442,6 @@ rtems_test_pause();
   fatal_directive_status( status, RTEMS_UNSATISFIED, "rtems_event_receive" );
   /***** *****/
 
-  puts( "*** END OF TEST 11 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp12/init.c b/testsuites/sptests/sp12/init.c
index 58cac3e..0b92004 100644
--- a/testsuites/sptests/sp12/init.c
+++ b/testsuites/sptests/sp12/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 12";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 12 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ]          = rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ]          = rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp12/system.h b/testsuites/sptests/sp12/system.h
index 05800e2..c91a8bd 100644
--- a/testsuites/sptests/sp12/system.h
+++ b/testsuites/sptests/sp12/system.h
@@ -59,6 +59,8 @@ rtems_task Task5(
 #define CONFIGURE_MAXIMUM_SEMAPHORES         10
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (6 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp12/task5.c b/testsuites/sptests/sp12/task5.c
index d9443d9..a8dfa33 100644
--- a/testsuites/sptests/sp12/task5.c
+++ b/testsuites/sptests/sp12/task5.c
@@ -51,6 +51,6 @@ rtems_task Task5(
   );
   puts( "TA5 - SM1 deleted by TA1" );
 
-  puts( "*** END OF TEST 12 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp13/init.c b/testsuites/sptests/sp13/init.c
index 9816333..ffa2d12 100644
--- a/testsuites/sptests/sp13/init.c
+++ b/testsuites/sptests/sp13/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 13";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 13 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp13/system.h b/testsuites/sptests/sp13/system.h
index 9f95548..ae5ed4f 100644
--- a/testsuites/sptests/sp13/system.h
+++ b/testsuites/sptests/sp13/system.h
@@ -49,6 +49,8 @@ rtems_task Task_3(
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     10
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MESSAGE_BUFFER_MEMORY     (32 * 1024)
diff --git a/testsuites/sptests/sp13/task1.c b/testsuites/sptests/sp13/task1.c
index 1a79284..e783e37 100644
--- a/testsuites/sptests/sp13/task1.c
+++ b/testsuites/sptests/sp13/task1.c
@@ -362,6 +362,6 @@ rtems_test_pause();
     directive_failed( status, "rtems_message_queue_delete" );
   }
 
-  puts( "*** END OF TEST 13 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp14/init.c b/testsuites/sptests/sp14/init.c
index 206b77a..b0cedc2 100644
--- a/testsuites/sptests/sp14/init.c
+++ b/testsuites/sptests/sp14/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 14";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 14 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp14/system.h b/testsuites/sptests/sp14/system.h
index 6babe7b..7721366 100644
--- a/testsuites/sptests/sp14/system.h
+++ b/testsuites/sptests/sp14/system.h
@@ -45,6 +45,8 @@ rtems_task Task_2(
 #define CONFIGURE_MAXIMUM_TIMERS              1
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (1 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp14/task2.c b/testsuites/sptests/sp14/task2.c
index 79a592a..9e1714f 100644
--- a/testsuites/sptests/sp14/task2.c
+++ b/testsuites/sptests/sp14/task2.c
@@ -51,6 +51,6 @@ rtems_task Task_2(
   status = rtems_task_wake_after(2 * rtems_clock_get_ticks_per_second());
   directive_failed( status, "rtems_task_wake_after" );
 
-  puts( "*** END OF TEST 14 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp15/init.c b/testsuites/sptests/sp15/init.c
index 697e11d..dcf8f95 100644
--- a/testsuites/sptests/sp15/init.c
+++ b/testsuites/sptests/sp15/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 15";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 15 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
 
diff --git a/testsuites/sptests/sp15/system.h b/testsuites/sptests/sp15/system.h
index c01dde3..09a34fb 100644
--- a/testsuites/sptests/sp15/system.h
+++ b/testsuites/sptests/sp15/system.h
@@ -32,6 +32,8 @@ rtems_task Task_1(
 #define CONFIGURE_MAXIMUM_PARTITIONS          2
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/sp15/task1.c b/testsuites/sptests/sp15/task1.c
index 16b6549..609d37f 100644
--- a/testsuites/sptests/sp15/task1.c
+++ b/testsuites/sptests/sp15/task1.c
@@ -125,6 +125,6 @@ rtems_task Task_1(
   status = rtems_partition_delete( ptid_2 );
   directive_failed( status, "rtems_partition_delete" );
 
-  puts( "*** END OF TEST 15 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp16/init.c b/testsuites/sptests/sp16/init.c
index 645a377..3b8543b 100644
--- a/testsuites/sptests/sp16/init.c
+++ b/testsuites/sptests/sp16/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 16";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 16 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp16/system.h b/testsuites/sptests/sp16/system.h
index 7af7954..139c757 100644
--- a/testsuites/sptests/sp16/system.h
+++ b/testsuites/sptests/sp16/system.h
@@ -48,6 +48,8 @@ rtems_task Task5(
 #define CONFIGURE_MAXIMUM_REGIONS             4
 #define CONFIGURE_TICKS_PER_TIMESLICE       100
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (1 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp16/task1.c b/testsuites/sptests/sp16/task1.c
index a6f9668..2df450f 100644
--- a/testsuites/sptests/sp16/task1.c
+++ b/testsuites/sptests/sp16/task1.c
@@ -291,6 +291,6 @@ rtems_test_pause();
   status = rtems_region_delete( Region_id[ 4 ] );
   directive_failed( status, "rtems_region_delete" );
 
-  puts( "*** END OF TEST 16 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp17/init.c b/testsuites/sptests/sp17/init.c
index 4cd8849..4f7cba8 100644
--- a/testsuites/sptests/sp17/init.c
+++ b/testsuites/sptests/sp17/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 17";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 17 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp17/system.h b/testsuites/sptests/sp17/system.h
index ce0e58a..9b84b2c 100644
--- a/testsuites/sptests/sp17/system.h
+++ b/testsuites/sptests/sp17/system.h
@@ -40,6 +40,8 @@ rtems_task Task_2(
 #define CONFIGURE_MICROSECONDS_PER_TICK   RTEMS_MILLISECONDS_TO_MICROSECONDS(25)
 #define CONFIGURE_TICKS_PER_TIMESLICE     1000
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/sp17/task1.c b/testsuites/sptests/sp17/task1.c
index 36c72ab..d21c782 100644
--- a/testsuites/sptests/sp17/task1.c
+++ b/testsuites/sptests/sp17/task1.c
@@ -44,6 +44,6 @@ rtems_task Task_1(
 
   puts("TA1 - Got Back!!!");
 
-  puts( "*** END OF TEST 17 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp18/init.c b/testsuites/sptests/sp18/init.c
index 5b15ed6..5f39794 100644
--- a/testsuites/sptests/sp18/init.c
+++ b/testsuites/sptests/sp18/init.c
@@ -15,6 +15,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 18";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -29,7 +31,7 @@ rtems_task Init(
   rtems_resource_snapshot snapshot;
   void                   *greedy;
 
-  puts( "\n\n*** TEST 18 ***" );
+  TEST_BEGIN();
 
   greedy = rtems_workspace_greedy_allocate_all_except_largest( &stack_size );
   rtems_resource_snapshot_take( &snapshot );
@@ -81,7 +83,7 @@ rtems_task Init(
 
   rtems_workspace_greedy_free( greedy );
 
-  puts( "*** END OF TEST 18 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -92,6 +94,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS            2
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS  20
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp19/fptask.c b/testsuites/sptests/sp19/fptask.c
index 58d9266..979182f 100644
--- a/testsuites/sptests/sp19/fptask.c
+++ b/testsuites/sptests/sp19/fptask.c
@@ -64,7 +64,7 @@ rtems_task FP_task(
       status = rtems_task_delete( Task_id[ 3 ] );
       directive_failed( status, "rtems_task_delete of TA3" );
 
-      puts( "*** END OF TEST 19 *** " );
+      TEST_END();
       rtems_test_exit( 0 );
     }
 
diff --git a/testsuites/sptests/sp19/init.c b/testsuites/sptests/sp19/init.c
index 1069ef7..f1b75c4 100644
--- a/testsuites/sptests/sp19/init.c
+++ b/testsuites/sptests/sp19/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 19";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 19 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp19/system.h b/testsuites/sptests/sp19/system.h
index b6cf211..5c13c9b 100644
--- a/testsuites/sptests/sp19/system.h
+++ b/testsuites/sptests/sp19/system.h
@@ -40,6 +40,8 @@ rtems_task Task_1(
 
 #define CONFIGURE_MAXIMUM_TASKS             7
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (24 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp20/init.c b/testsuites/sptests/sp20/init.c
index 73256f8..746639b 100644
--- a/testsuites/sptests/sp20/init.c
+++ b/testsuites/sptests/sp20/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 20";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -33,7 +35,7 @@ rtems_task Init(
   uint32_t    index;
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 20 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/sp20/system.h b/testsuites/sptests/sp20/system.h
index 514c674..906331d 100644
--- a/testsuites/sptests/sp20/system.h
+++ b/testsuites/sptests/sp20/system.h
@@ -43,6 +43,8 @@ void Get_all_counters( void );
 
 #define CONFIGURE_INIT_TASK_PRIORITY          10
 #define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (6 * 4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp20/task1.c b/testsuites/sptests/sp20/task1.c
index 94fde1e..6edfd23 100644
--- a/testsuites/sptests/sp20/task1.c
+++ b/testsuites/sptests/sp20/task1.c
@@ -118,7 +118,7 @@ rtems_task Task_1_through_6(
         fflush( stdout );
 
         if ( pass == 10 ) {
-          puts( "*** END OF TEST 20 ***" );
+          TEST_END();
           rtems_test_exit( 0 );
         }
 
diff --git a/testsuites/sptests/sp2038/init.c b/testsuites/sptests/sp2038/init.c
index 595f900..9fac38a 100644
--- a/testsuites/sptests/sp2038/init.c
+++ b/testsuites/sptests/sp2038/init.c
@@ -23,6 +23,8 @@
 
 #include <rtems.h>
 
+const char rtems_test_name[] = "SP 2038";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -284,13 +286,13 @@ static void test_leap_year(void)
 
 rtems_task Init(rtems_task_argument argument)
 {
-  puts("\n\n*** TEST 2038 ***");
+  TEST_BEGIN();
 
   test_tod_to_seconds();
   test_problem_year();
   test_leap_year();
 
-  puts("*** END OF TEST 2038 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -300,6 +302,8 @@ rtems_task Init(rtems_task_argument argument)
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp21/init.c b/testsuites/sptests/sp21/init.c
index f7d9bc4..62a48b8 100644
--- a/testsuites/sptests/sp21/init.c
+++ b/testsuites/sptests/sp21/init.c
@@ -16,6 +16,8 @@
 #include <rtems/devzero.h>
 #include <rtems/libio.h>
 
+const char rtems_test_name[] = "SP 21";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void do_test_io_manager(void);
@@ -253,7 +255,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST 21 ***" );
+  TEST_BEGIN();
 
   do_test_io_manager();
 
@@ -261,7 +263,7 @@ rtems_task Init(
 
   do_test_zero_driver();
 
-  puts( "*** END OF TEST 21 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -274,6 +276,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp22/init.c b/testsuites/sptests/sp22/init.c
index f940b08..23956e6 100644
--- a/testsuites/sptests/sp22/init.c
+++ b/testsuites/sptests/sp22/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 22";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -33,7 +35,7 @@ rtems_task Init(
   rtems_time_of_day  time;
   rtems_status_code  status;
 
-  puts( "\n\n*** TEST 22 ***" );
+  TEST_BEGIN();
 
   build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
 
diff --git a/testsuites/sptests/sp22/system.h b/testsuites/sptests/sp22/system.h
index ec5c80d..6ca7203 100644
--- a/testsuites/sptests/sp22/system.h
+++ b/testsuites/sptests/sp22/system.h
@@ -39,6 +39,8 @@ rtems_task Task_1(
 #define CONFIGURE_MAXIMUM_TIMERS          2
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp22/task1.c b/testsuites/sptests/sp22/task1.c
index 75c78cb..3910bb2 100644
--- a/testsuites/sptests/sp22/task1.c
+++ b/testsuites/sptests/sp22/task1.c
@@ -160,6 +160,6 @@ rtems_task Task_1(
   status = rtems_timer_delete( tmid );
   directive_failed( status, "rtems_timer_delete" );
 
-  puts( "*** END OF TEST 22 *** " );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp23/init.c b/testsuites/sptests/sp23/init.c
index e5dd6b7..e0ee2f9 100644
--- a/testsuites/sptests/sp23/init.c
+++ b/testsuites/sptests/sp23/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 23";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 23 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
 
diff --git a/testsuites/sptests/sp23/system.h b/testsuites/sptests/sp23/system.h
index 622dcb7..21e26f9 100644
--- a/testsuites/sptests/sp23/system.h
+++ b/testsuites/sptests/sp23/system.h
@@ -32,6 +32,8 @@ rtems_task Task_1(
 #define CONFIGURE_MAXIMUM_PORTS           1
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp23/task1.c b/testsuites/sptests/sp23/task1.c
index 1fdace5..659eef1 100644
--- a/testsuites/sptests/sp23/task1.c
+++ b/testsuites/sptests/sp23/task1.c
@@ -92,6 +92,6 @@ rtems_task Task_1(
   directive_failed( status, "rtems_port_delete" );
   puts( "TA1 - rtems_port_delete - DP1" );
 
-  puts( "*** END OF TEST 23 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp24/init.c b/testsuites/sptests/sp24/init.c
index 588e3c8..b0e7f15 100644
--- a/testsuites/sptests/sp24/init.c
+++ b/testsuites/sptests/sp24/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 24";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -34,7 +36,7 @@ rtems_task Init(
   uint32_t    index;
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 24 ***" );
+  TEST_BEGIN();
 
   build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
 
diff --git a/testsuites/sptests/sp24/system.h b/testsuites/sptests/sp24/system.h
index ef91fc8..9da8005 100644
--- a/testsuites/sptests/sp24/system.h
+++ b/testsuites/sptests/sp24/system.h
@@ -36,6 +36,8 @@ rtems_task Task_1_through_3(
 #define CONFIGURE_MAXIMUM_TASKS               4
 #define CONFIGURE_MAXIMUM_TIMERS              3
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS           (3 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp24/task1.c b/testsuites/sptests/sp24/task1.c
index f6b58cb..9a2de67 100644
--- a/testsuites/sptests/sp24/task1.c
+++ b/testsuites/sptests/sp24/task1.c
@@ -46,7 +46,7 @@ rtems_task Task_1_through_3(
     directive_failed( status, "rtems_clock_get_tod failed" );
 
     if ( time.second >= 35 ) {
-      puts( "*** END OF TEST 24 ***" );
+      TEST_END();
       rtems_test_exit( 0 );
     }
 
diff --git a/testsuites/sptests/sp25/init.c b/testsuites/sptests/sp25/init.c
index 19b6a5b..e744e5c 100644
--- a/testsuites/sptests/sp25/init.c
+++ b/testsuites/sptests/sp25/init.c
@@ -26,13 +26,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 25";
+
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 25 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
 
diff --git a/testsuites/sptests/sp25/system.h b/testsuites/sptests/sp25/system.h
index cae7610..7a32f26 100644
--- a/testsuites/sptests/sp25/system.h
+++ b/testsuites/sptests/sp25/system.h
@@ -31,6 +31,8 @@ rtems_task Task_1(
 #define CONFIGURE_MAXIMUM_TASKS               2
 #define CONFIGURE_MAXIMUM_REGIONS             1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/sp25/task1.c b/testsuites/sptests/sp25/task1.c
index bcbdf66..230e8d4 100644
--- a/testsuites/sptests/sp25/task1.c
+++ b/testsuites/sptests/sp25/task1.c
@@ -281,6 +281,6 @@ rtems_test_pause();
   puts( "TA1 - rtems_region_delete - walks heap if debug enabled" );
   rtems_region_delete(Region_id[ 1 ]);
 
-  puts( "*** END OF TEST 25 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp26/init.c b/testsuites/sptests/sp26/init.c
index 1a5069e..0ac7157 100644
--- a/testsuites/sptests/sp26/init.c
+++ b/testsuites/sptests/sp26/init.c
@@ -26,12 +26,13 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 26";
 
 rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST 26 ***" );
+  TEST_BEGIN();
 
   task1();
   /* does not return */
diff --git a/testsuites/sptests/sp26/system.h b/testsuites/sptests/sp26/system.h
index 4f45fab..fdb2247 100644
--- a/testsuites/sptests/sp26/system.h
+++ b/testsuites/sptests/sp26/system.h
@@ -30,6 +30,8 @@ void task1(void);
 #define CONFIGURE_MAXIMUM_TASKS               5
 #define CONFIGURE_MAXIMUM_REGIONS             1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/sp26/task1.c b/testsuites/sptests/sp26/task1.c
index f5ef895..45aa08d 100644
--- a/testsuites/sptests/sp26/task1.c
+++ b/testsuites/sptests/sp26/task1.c
@@ -82,7 +82,7 @@ subTask2 (rtems_task_argument arg)
   printf ("subTask2 - Task 1 suspended? - should be 1: %d\n",
      isSuspended (taskId1));
 
-  puts( "*** END OF TEST 26 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/sptests/sp27/init.c b/testsuites/sptests/sp27/init.c
index 23f7873..bb4630d 100644
--- a/testsuites/sptests/sp27/init.c
+++ b/testsuites/sptests/sp27/init.c
@@ -39,6 +39,8 @@ void doTest(void);
 	    RTEMS_NO_PRIORITY_CEILING|RTEMS_FIFO)
 #endif
 
+const char rtems_test_name[] = "SP " TEST_NAME;
+
 rtems_id semaphore;
 volatile int flags[NTASK];
 
@@ -115,16 +117,18 @@ rtems_task Init(
   rtems_task_argument ignored
 )
 {
-  puts( "\n\n*** TEST " TEST_NAME " ***" );
+  TEST_BEGIN();
   puts( "Testing " TEST_SEMAPHORE_TYPE " semaphore flush" );
   doTest();
-  puts( "*** END OF TEST " TEST_NAME " ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
 
 /**************** START OF CONFIGURATION INFORMATION ****************/
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
diff --git a/testsuites/sptests/sp28/init.c b/testsuites/sptests/sp28/init.c
index cfbc04c..4798bff 100644
--- a/testsuites/sptests/sp28/init.c
+++ b/testsuites/sptests/sp28/init.c
@@ -17,6 +17,8 @@
 #include <rtems/error.h>
 #include <stdio.h>
 
+const char rtems_test_name[] = "SP 28";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task subtask(rtems_task_argument arg);
@@ -103,7 +105,7 @@ subtask (rtems_task_argument arg)
   while (nRunning)
     rtems_task_wake_after(0);
 
-  puts("*** END OF TEST 28 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -402,7 +404,7 @@ void test_delete_as_side_effect(void)
 
 rtems_task Init (rtems_task_argument ignored)
 {
-  puts("*** START OF TEST 28 ***" );
+  TEST_BEGIN();
 
   test_errors();
 
@@ -427,6 +429,8 @@ rtems_task Init (rtems_task_argument ignored)
 
 #define CONFIGURE_MAXIMUM_TASKS              4
 #define CONFIGURE_MAXIMUM_TASK_VARIABLES     (4)
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MICROSECONDS_PER_TICK      10000
 
diff --git a/testsuites/sptests/sp29/init.c b/testsuites/sptests/sp29/init.c
index b8ed6bc..e65fbe3 100644
--- a/testsuites/sptests/sp29/init.c
+++ b/testsuites/sptests/sp29/init.c
@@ -11,10 +11,14 @@
 #include <tmacros.h>
 #include <bsp.h>
 
+const char rtems_test_name[] = "SP 29";
+
 rtems_task Init (rtems_task_argument argument);
 
 #define CONFIGURE_EXTRA_TASK_STACKS RTEMS_MINIMUM_STACK_SIZE
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
@@ -86,7 +90,7 @@ rtems_task Init (rtems_task_argument ignored)
   rtems_status_code sc;
   rtems_interval then, now;
 
-  puts( "*** SP29 - SIMPLE SEMAPHORE TEST ***" );
+  TEST_BEGIN();
   puts( "This test only prints on errors." );
 
   ticksPerSecond = rtems_clock_get_ticks_per_second();
@@ -225,6 +229,6 @@ rtems_task Init (rtems_task_argument ignored)
     }
   }
 
-  puts( "*** END OF TEST 29 ***" );
+  TEST_END();
   rtems_test_exit (0);
 }
diff --git a/testsuites/sptests/sp30/init.c b/testsuites/sptests/sp30/init.c
index c556d9f..21fb3dd 100644
--- a/testsuites/sptests/sp30/init.c
+++ b/testsuites/sptests/sp30/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 30";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -34,7 +36,7 @@ rtems_task Init(
   uint32_t    index;
   rtems_status_code status;
 
-  puts( "\n\n*** TEST 30 ***" );
+  TEST_BEGIN();
 
   build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
 
diff --git a/testsuites/sptests/sp30/system.h b/testsuites/sptests/sp30/system.h
index 6a49291..2c716bd 100644
--- a/testsuites/sptests/sp30/system.h
+++ b/testsuites/sptests/sp30/system.h
@@ -36,6 +36,8 @@ rtems_task Task_1_through_3(
 #define CONFIGURE_MAXIMUM_TASKS               5
 #define CONFIGURE_MAXIMUM_TIMERS              3
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS           (3 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp30/task1.c b/testsuites/sptests/sp30/task1.c
index 054a3fa..da4b0d2 100644
--- a/testsuites/sptests/sp30/task1.c
+++ b/testsuites/sptests/sp30/task1.c
@@ -46,7 +46,7 @@ rtems_task Task_1_through_3(
     directive_failed( status, "rtems_clock_get_tod failed" );
 
     if ( time.second >= 35 ) {
-      puts( "*** END OF TEST 30 ***" );
+      TEST_END();
       rtems_test_exit( 0 );
     }
 
diff --git a/testsuites/sptests/sp31/init.c b/testsuites/sptests/sp31/init.c
index e068dbb..020ec25 100644
--- a/testsuites/sptests/sp31/init.c
+++ b/testsuites/sptests/sp31/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 31";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -33,7 +35,7 @@ rtems_task Init(
   rtems_time_of_day  time;
   rtems_status_code  status;
 
-  puts( "\n\n*** TEST 31 ***" );
+  TEST_BEGIN();
 
   build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
 
diff --git a/testsuites/sptests/sp31/system.h b/testsuites/sptests/sp31/system.h
index 3d72274..b631949 100644
--- a/testsuites/sptests/sp31/system.h
+++ b/testsuites/sptests/sp31/system.h
@@ -39,6 +39,8 @@ rtems_task Task_1(
 #define CONFIGURE_MAXIMUM_TIMERS          2
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp31/task1.c b/testsuites/sptests/sp31/task1.c
index 599b091..f4e526a 100644
--- a/testsuites/sptests/sp31/task1.c
+++ b/testsuites/sptests/sp31/task1.c
@@ -358,6 +358,6 @@ rtems_task Task_1(
   status = rtems_timer_delete( tmid );
   directive_failed( status, "rtems_timer_delete" );
 
-  puts( "*** END OF TEST 31 *** " );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp32/init.c b/testsuites/sptests/sp32/init.c
index 210488d..71cd46c 100644
--- a/testsuites/sptests/sp32/init.c
+++ b/testsuites/sptests/sp32/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>  /* includes bsp.h, stdio, etc... */
 
+const char rtems_test_name[] = "SP 32";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -26,7 +28,7 @@ rtems_task Init(
   rtems_id           period_id;
   int                loopy;
 
-  printf("\n\n*** TEST 32 ***\n");
+  TEST_BEGIN();
 
   /* create period */
   status = rtems_rate_monotonic_create(
@@ -77,10 +79,12 @@ rtems_task Init(
     );
   }
 
-  puts("*** END OF TEST 32 ***");
+  TEST_END();
   rtems_test_exit(0);
 }
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c
index f648ef9..828c374 100644
--- a/testsuites/sptests/sp33/init.c
+++ b/testsuites/sptests/sp33/init.c
@@ -14,9 +14,13 @@
 #define CONFIGURE_INIT
 #include <tmacros.h>  /* includes bsp.h, stdio, etc... */
 
+const char rtems_test_name[] = "SP 33";
+
 /* prototype */
 rtems_task Init (rtems_task_argument ignored);
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
@@ -72,7 +76,7 @@ rtems_task Init(
   rtems_id          Tasks[CONFIGURE_MAXIMUM_TASKS-1];
   uint32_t          i;
 
-  puts("\n\n*** TEST 33 ***");
+  TEST_BEGIN();
 
   /* Check bad argument cases */
   puts( "rtems_barrier_delete - bad id - INVALID_ID" );
@@ -281,6 +285,6 @@ rtems_task Init(
   directive_failed(status, "rtems_task_wake_after");
 
   /* the end */
-  puts("*** END OF TEST 33 ***");
+  TEST_END();
   rtems_test_exit(0);
 }
diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c
index 87642ca..fea1fbe 100644
--- a/testsuites/sptests/sp34/changepri.c
+++ b/testsuites/sptests/sp34/changepri.c
@@ -29,6 +29,8 @@
 #include <stdio.h>
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SP 34";
+
 rtems_task BlockingTasks(rtems_task_argument arg);
 rtems_task Init(rtems_task_argument ignored);
 const char *CallerName(void);
@@ -111,7 +113,7 @@ rtems_task Init(rtems_task_argument ignored)
   rtems_status_code   status;
   int                 i;
 
-  puts( "\n\n*** TEST 34 ***" );
+  TEST_BEGIN();
 
   /* Create synchronisation semaphore for LocalHwIsr -> Test Tasks */
   status = rtems_semaphore_create(
@@ -169,7 +171,7 @@ rtems_task Init(rtems_task_argument ignored)
   }
 
   /* exit the test */
-  puts( "*** END OF TEST 34 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -178,6 +180,8 @@ rtems_task Init(rtems_task_argument ignored)
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS \
diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c
index aaac31f..c7eb336 100644
--- a/testsuites/sptests/sp35/priinv.c
+++ b/testsuites/sptests/sp35/priinv.c
@@ -58,6 +58,8 @@
 #include <stdio.h>
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SP 35";
+
 #if defined(TEST_EXIT_AFTER_ITERATIONS)
 volatile uint32_t Iterations = 0;
 #endif
@@ -297,7 +299,7 @@ void AccessLocalHw(void)
   printf("  AccessLocalHw returns to %s\n", CallerName());
   #if defined(TEST_EXIT_AFTER_ITERATIONS)
     if ( ++Iterations == 10 ) {
-      puts( "*** END OF TEST 35 ***" );
+      TEST_END();
       exit(0);
     }
   #endif
@@ -375,7 +377,7 @@ rtems_task Init(rtems_task_argument ignored)
 #endif
   int i;
 
-  puts( "\n\n*** TEST 35 ***" );
+  TEST_BEGIN();
 
   /* Create synchronisation semaphore for LocalHwIsr -> Test Tasks */
   status = rtems_semaphore_create(
@@ -506,6 +508,8 @@ rtems_task Init(rtems_task_argument ignored)
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS (RTEMS_MINIMUM_STACK_SIZE * 3)
diff --git a/testsuites/sptests/sp36/strict_order_mut.c b/testsuites/sptests/sp36/strict_order_mut.c
index ad9c4d7..5bc7c57 100644
--- a/testsuites/sptests/sp36/strict_order_mut.c
+++ b/testsuites/sptests/sp36/strict_order_mut.c
@@ -25,6 +25,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS (RTEMS_MINIMUM_STACK_SIZE * 3)
diff --git a/testsuites/sptests/sp37/init.c b/testsuites/sptests/sp37/init.c
index 283b1ab..abe72d1 100644
--- a/testsuites/sptests/sp37/init.c
+++ b/testsuites/sptests/sp37/init.c
@@ -21,6 +21,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 37";
+
 /* prototypes */
 void test_interrupt_inline(void);
 void check_isr_in_progress_inline(void);
@@ -380,7 +382,7 @@ rtems_task Init(
   rtems_id              timer;
   int                   i;
 
-  puts( "\n\n*** TEST 37 ***" );
+  TEST_BEGIN();
 
   test_isr_level();
   test_isr_locks();
@@ -517,6 +519,6 @@ rtems_task Init(
 
   check_isr_worked( "body", isr_in_progress_body );
 
-  puts( "*** END OF TEST 37 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp37/system.h b/testsuites/sptests/sp37/system.h
index 0e54b5e..43bef81 100644
--- a/testsuites/sptests/sp37/system.h
+++ b/testsuites/sptests/sp37/system.h
@@ -26,6 +26,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_INIT_TASK_PRIORITY        2
 #define CONFIGURE_INIT_TASK_INITIAL_MODES   RTEMS_PREEMPT
diff --git a/testsuites/sptests/sp38/init.c b/testsuites/sptests/sp38/init.c
index 907d350..d77d5d2 100644
--- a/testsuites/sptests/sp38/init.c
+++ b/testsuites/sptests/sp38/init.c
@@ -16,6 +16,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SP 38";
+
 volatile bool signal_sent;
 volatile bool signal_processed;
 
@@ -55,7 +57,7 @@ rtems_task Init(
   rtems_interval        start;
   rtems_interval        now;
 
-  puts( "\n\n*** TEST 38 ***" );
+  TEST_BEGIN();
 
   main_task = rtems_task_self();
 
@@ -93,6 +95,6 @@ rtems_task Init(
   }
 
   puts( "Signal sent from ISR has been processed" );
-  puts( "*** END OF TEST 38 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp38/system.h b/testsuites/sptests/sp38/system.h
index b367b3e..b9965af 100644
--- a/testsuites/sptests/sp38/system.h
+++ b/testsuites/sptests/sp38/system.h
@@ -24,6 +24,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MAXIMUM_TASKS             1
diff --git a/testsuites/sptests/sp39/init.c b/testsuites/sptests/sp39/init.c
index 96425e4..b78cd7f 100644
--- a/testsuites/sptests/sp39/init.c
+++ b/testsuites/sptests/sp39/init.c
@@ -18,6 +18,8 @@
 
 #include <rtems/rtems/eventimpl.h>
 
+const char rtems_test_name[] = "SP 39";
+
 /*
  *  ERROR CHECKING NOTE:
  *
@@ -97,7 +99,7 @@ rtems_task Init(
   int                   max;
   uint32_t              iterations = 0;
 
-  puts( "\n\n*** TEST 39 ***" );
+  TEST_BEGIN();
 
   main_task = rtems_task_self();
 
@@ -185,6 +187,6 @@ rtems_task Init(
     (( case_hit == TRUE ) ? "" : "NOT ")
   );
 
-  puts( "*** END OF TEST 39 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp39/system.h b/testsuites/sptests/sp39/system.h
index b9aa136..f5f1f25 100644
--- a/testsuites/sptests/sp39/system.h
+++ b/testsuites/sptests/sp39/system.h
@@ -24,6 +24,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MICROSECONDS_PER_TICK   1000
diff --git a/testsuites/sptests/sp40/init.c b/testsuites/sptests/sp40/init.c
index 3cd22e7..5b0ad7d 100644
--- a/testsuites/sptests/sp40/init.c
+++ b/testsuites/sptests/sp40/init.c
@@ -17,6 +17,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 40";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -63,7 +65,7 @@ rtems_task Init(
   rtems_interrupt_level level;
   bool do_interrupt_context_test = true;
 
-  puts( "\n\n*** TEST 40 ***" );
+  TEST_BEGIN();
 
   /* Ensure that this test works as expected */
   test_interrupt_context_enter( level );
@@ -170,7 +172,7 @@ rtems_task Init(
     "rtems_io_unregister_driver"
   );
 
-  puts( "*** END OF TEST 40 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -183,6 +185,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_DRIVERS 3
 
 #define CONFIGURE_MAXIMUM_TASKS  1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp41/init.c b/testsuites/sptests/sp41/init.c
index 16fb2a5..c484608 100644
--- a/testsuites/sptests/sp41/init.c
+++ b/testsuites/sptests/sp41/init.c
@@ -15,6 +15,8 @@
 
 #include <rtems/score/objectimpl.h>
 
+const char rtems_test_name[] = "SP 41";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void iterator(Thread_Control *thread);
@@ -31,7 +33,7 @@ rtems_task Init(
 {
   void *tmp;
 
-  puts( "\n\n*** TEST 41 ***" );
+  TEST_BEGIN();
 
   puts( "Init - overwrite internal value to trip case" );
   tmp = _Objects_Information_table[ OBJECTS_CLASSIC_API ][ 1 ];
@@ -41,7 +43,7 @@ rtems_task Init(
   rtems_iterate_over_all_threads(iterator);
   _Objects_Information_table[ OBJECTS_CLASSIC_API ][ 1 ] = tmp;
 
-  puts( "*** END OF TEST 41 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -51,6 +53,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS         1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp42/init.c b/testsuites/sptests/sp42/init.c
index 16562ba..55faa9b 100644
--- a/testsuites/sptests/sp42/init.c
+++ b/testsuites/sptests/sp42/init.c
@@ -20,6 +20,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SP 42";
+
 #define MAX_TASKS 20
 
 rtems_task Init(rtems_task_argument argument);
@@ -150,7 +152,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** START OF TEST 42 ***" );
+  TEST_BEGIN();
 
   if (RTEMS_MAXIMUM_PRIORITY == 255)
     Priorities = Priorities_High;
@@ -185,7 +187,7 @@ rtems_task Init(
   puts( "Exercising blocking discipline w/unblock in priority order" );
   do_test( RTEMS_PRIORITY, FALSE );
 
-  puts( "*** END OF TEST 42 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -199,6 +201,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS             MAX_TASKS+1
 #define CONFIGURE_MAXIMUM_SEMAPHORES        1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c
index 1b393ce..dbea7fa 100644
--- a/testsuites/sptests/sp43/init.c
+++ b/testsuites/sptests/sp43/init.c
@@ -18,6 +18,8 @@
 
 #include <rtems/score/objectimpl.h>
 
+const char rtems_test_name[] = "SP 43";
+
 /* These functions have both macro and function incarnations */
 #undef rtems_build_id
 extern rtems_id rtems_build_id(int api,int class,int node,int index);
@@ -126,7 +128,7 @@ rtems_task Init(
   int                                 part;
   rtems_object_api_class_information  info;
 
-  puts( "\n\n*** TEST 43 ***" );
+  TEST_BEGIN();
 
   printf( "RTEMS Version: %s\n", rtems_get_version_string() );
 
@@ -520,6 +522,6 @@ rtems_task Init(
     _Objects_Information_table[OBJECTS_POSIX_API] = tmp;
   }
 
-  puts( "*** END OF TEST 43 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sp43/system.h b/testsuites/sptests/sp43/system.h
index ff0d163..991b51f 100644
--- a/testsuites/sptests/sp43/system.h
+++ b/testsuites/sptests/sp43/system.h
@@ -24,6 +24,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MAXIMUM_TASKS             2
diff --git a/testsuites/sptests/sp44/init.c b/testsuites/sptests/sp44/init.c
index d5562eb..26e4283 100644
--- a/testsuites/sptests/sp44/init.c
+++ b/testsuites/sptests/sp44/init.c
@@ -14,6 +14,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+const char rtems_test_name[] = "SP 44";
+
 rtems_task Init(rtems_task_argument ignored);
 rtems_task TaskAB_entry(rtems_task_argument me);
 
@@ -63,7 +65,7 @@ rtems_task TaskAB_entry(rtems_task_argument me)
       turn = 1 - me;
 
       if ( ++iterations == 10 ) {
-        puts( "*** END OF SP44 TEST ***" );
+        TEST_END();
         exit( 0 );
       }
     }
@@ -74,7 +76,7 @@ rtems_task Init(rtems_task_argument ignored)
 {
   static rtems_status_code status;
 
-  puts( "\n\n*** SP44 TEST ***" );
+  TEST_BEGIN();
 
   /* Create Task A */
   status = rtems_task_create(
@@ -124,6 +126,8 @@ rtems_task Init(rtems_task_argument ignored)
 #define CONFIGURE_TICKS_PER_TIMESLICE   10
 #define CONFIGURE_MAXIMUM_TASKS         3
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp45/init.c b/testsuites/sptests/sp45/init.c
index 9192adc..b8b43b4 100644
--- a/testsuites/sptests/sp45/init.c
+++ b/testsuites/sptests/sp45/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 45";
+
 rtems_task Init(
   rtems_task_argument argument
 );
@@ -52,7 +54,7 @@ rtems_task Init(
 {
   rtems_status_code  status;
 
-  puts( "\n\n*** TEST 45 ***" );
+  TEST_BEGIN();
 
   status = rtems_timer_initiate_server(
     RTEMS_TIMER_SERVER_DEFAULT_PRIORITY,
@@ -113,7 +115,7 @@ rtems_task Init(
   directive_failed( status, "rtems_timer_delete" );
 
 
-  puts( "*** END OF TEST 45 *** " );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -128,6 +130,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TIMERS          2
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp46/init.c b/testsuites/sptests/sp46/init.c
index 988a044..55653e0 100644
--- a/testsuites/sptests/sp46/init.c
+++ b/testsuites/sptests/sp46/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include <rtems/cpuuse.h>
 
+const char rtems_test_name[] = "SP 46";
+
 rtems_task Periodic_Task(
   rtems_task_argument argument
 );
@@ -66,7 +68,7 @@ rtems_task Init(
   rtems_status_code  status;
   rtems_id           task_id;
 
-  puts( "\n\n*** TEST 46 ***" );
+  TEST_BEGIN();
 
   /*
    * Initialize Tasks
@@ -101,7 +103,7 @@ rtems_task Init(
   /*
    *  Exit test
    */
-  puts( "*** END OF TEST 46 *** " );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -118,6 +120,8 @@ rtems_task Init(
 #define CONFIGURE_INIT_TASK_PRIORITY      10
 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sp47/init.c b/testsuites/sptests/sp47/init.c
index f3bce86..1a0d569 100644
--- a/testsuites/sptests/sp47/init.c
+++ b/testsuites/sptests/sp47/init.c
@@ -8,6 +8,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 47";
+
 #define PRIXModes_Control 	PRIX32
 #define PRIXrtems_mode		PRIXModes_Control
 
@@ -29,7 +31,7 @@ rtems_task test_asr(rtems_task_argument unused)
   } else
     puts( "Creating task with ASR disable mode honored" );
 
-  puts( "*** END OF TEST 47 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -38,7 +40,7 @@ rtems_task Init(rtems_task_argument ignored)
   rtems_status_code sc;
   rtems_id ti;
 
-  puts( "\n\n*** TEST 47 ***" );
+  TEST_BEGIN();
   sc = rtems_task_create(
     rtems_build_name('t', 's', 't', '0'),
     100,
@@ -68,6 +70,8 @@ rtems_task Init(rtems_task_argument ignored)
 #define CONFIGURE_MAXIMUM_TASKS            64
 #define CONFIGURE_MAXIMUM_PERIODS		  10
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
diff --git a/testsuites/sptests/sp48/init.c b/testsuites/sptests/sp48/init.c
index 088bd5a..e105528 100644
--- a/testsuites/sptests/sp48/init.c
+++ b/testsuites/sptests/sp48/init.c
@@ -16,6 +16,8 @@
 #include <tmacros.h>
 #include <rtems/libcsupport.h>
 
+const char rtems_test_name[] = "SP 48";
+
 rtems_task Init(rtems_task_argument ignored);
 
 #define MAX 5000
@@ -27,7 +29,7 @@ rtems_task Init(rtems_task_argument ignored)
   int               i;
   int               created;
 
-  puts( "\n\n*** TEST 48 ***" );
+  TEST_BEGIN();
 
   printf(
     "Largest C program heap block available: %zu\n",
@@ -79,7 +81,7 @@ rtems_task Init(rtems_task_argument ignored)
     malloc_free_space()
   );
 
-  puts( "*** END OF TEST 48 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -96,6 +98,8 @@ rtems_task Init(rtems_task_argument ignored)
   #define CONFIGURE_MEMORY_OVERHEAD    1024
 #endif
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
diff --git a/testsuites/sptests/sp49/init.c b/testsuites/sptests/sp49/init.c
index beb223d..64db98e 100644
--- a/testsuites/sptests/sp49/init.c
+++ b/testsuites/sptests/sp49/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 49";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -22,7 +24,7 @@ rtems_task Init(rtems_task_argument ignored)
   rtems_id          q;
   uint32_t          flushed;
 
-  puts( "\n\n*** TEST 49 ***" );
+  TEST_BEGIN();
 
   puts( "Create Message Queue" );
   sc = rtems_message_queue_create(
@@ -40,7 +42,7 @@ rtems_task Init(rtems_task_argument ignored)
 
   puts( "Flush returned INVALID_ID as expected" );
 
-  puts( "*** END OF TEST 49 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -53,6 +55,8 @@ rtems_task Init(rtems_task_argument ignored)
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
 #define CONFIGURE_MESSAGE_BUFFER_MEMORY      256 /* overkill */
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp50/init.c b/testsuites/sptests/sp50/init.c
index 6d56099..58a7be7 100644
--- a/testsuites/sptests/sp50/init.c
+++ b/testsuites/sptests/sp50/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include "pritime.h"
 
+const char rtems_test_name[] = "SP 50";
+
 /* forward declarations to avoid warnings */
 rtems_timer_service_routine Timer_Routine(rtems_id id, void *ignored);
 rtems_task Init(rtems_task_argument argument);
@@ -46,7 +48,7 @@ rtems_task Init(
   rtems_id          timer1;
   struct timespec   uptime;
 
-  puts( "\n\n*** TEST 50 ***" );
+  TEST_BEGIN();
 
   sc = rtems_timer_initiate_server(
     1,
@@ -77,7 +79,7 @@ rtems_task Init(
     }
 
     if ( Fired >= 10 ) {
-      puts( "*** END OF TEST 50 ***" );
+      TEST_END();
       rtems_test_exit( 0 );
     }
     /* technically the following is a critical section */
@@ -94,6 +96,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS         2
 #define CONFIGURE_MAXIMUM_TIMERS        1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/sp51/init.c b/testsuites/sptests/sp51/init.c
index 24640a2..fba2206 100644
--- a/testsuites/sptests/sp51/init.c
+++ b/testsuites/sptests/sp51/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 51";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -23,7 +25,7 @@ rtems_task Init(
   rtems_status_code sc;
   rtems_id          mutex;
 
-  puts( "\n\n*** TEST 51 ***" );
+  TEST_BEGIN();
 
   puts( "Create semaphore - priority ceiling locked - violate ceiling" );
   sc = rtems_semaphore_create(
@@ -55,7 +57,7 @@ rtems_task Init(
   sc = rtems_semaphore_release( mutex );
   directive_failed( sc, "rtems_semaphore_release" );
 
-  puts( "*** END OF TEST 51 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -69,6 +71,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS         1
 #define CONFIGURE_MAXIMUM_SEMAPHORES    1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/sp52/init.c b/testsuites/sptests/sp52/init.c
index 1615bd7..f003d1c 100644
--- a/testsuites/sptests/sp52/init.c
+++ b/testsuites/sptests/sp52/init.c
@@ -27,6 +27,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP " TEST_NUMBER;
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_timer_service_routine TIMER_service_routine(
@@ -57,7 +59,7 @@ rtems_task Init(
   rtems_time_of_day global_time;
   rtems_time_of_day time_to_fire;
 
-  puts( "\n\n*** TEST " TEST_NUMBER " ***" );
+  TEST_BEGIN();
 
   /* build timer name*/
   timer_name = rtems_build_name('T', 'M', '1', ' ');
@@ -107,7 +109,7 @@ rtems_task Init(
 
   puts( TSR_MODE " Timer fired after setting time forward -- OK");
 
-  puts( "*** END OF TEST " TEST_NUMBER " ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -119,6 +121,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS              2
 #define CONFIGURE_MAXIMUM_TIMERS             1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT_TASK_PRIORITY (RTEMS_MINIMUM_PRIORITY + 1)
diff --git a/testsuites/sptests/sp54/init.c b/testsuites/sptests/sp54/init.c
index 47f8b0a..560c8b4 100644
--- a/testsuites/sptests/sp54/init.c
+++ b/testsuites/sptests/sp54/init.c
@@ -20,6 +20,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 54";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -35,7 +37,7 @@ rtems_task Init(
    *  It is possible that since this thread prints and there is no idle
    *  task, that the system could fail miserably. :(
    */
-  puts( "\n\n*** TEST 54 ***" );
+  TEST_BEGIN();
 
   puts( "Init - use valid id of API class with no objects" );
   status = rtems_task_set_priority(
@@ -53,7 +55,7 @@ rtems_task Init(
   );
   fatal_directive_status( status, RTEMS_INVALID_NAME, "rtems_task_ident" );
 
-  puts( "*** END OF TEST 54 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/sptests/sp55/init.c b/testsuites/sptests/sp55/init.c
index e163afa..ee06e84 100644
--- a/testsuites/sptests/sp55/init.c
+++ b/testsuites/sptests/sp55/init.c
@@ -19,6 +19,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 55";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -31,7 +33,7 @@ rtems_task Init(
   int                  msg = 1;
   uint32_t             count = 20;
 
-  puts( "\n\n*** TEST 55 ***" );
+  TEST_BEGIN();
 
   puts( "Init - rtems_message_queue_create - OK" );
   status = rtems_message_queue_create(
@@ -59,7 +61,7 @@ rtems_task Init(
   status = rtems_message_queue_delete( id );
   directive_failed( status, "rtems_message_queue_delete" );
 
-  puts( "*** END OF TEST 55 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -70,6 +72,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS              1
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MESSAGE_BUFFER_MEMORY \
diff --git a/testsuites/sptests/sp56/init.c b/testsuites/sptests/sp56/init.c
index 4d3a0e0..c0ce3c0 100644
--- a/testsuites/sptests/sp56/init.c
+++ b/testsuites/sptests/sp56/init.c
@@ -19,6 +19,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 56";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 bool task_create(Thread_Control *executing, Thread_Control *created);
@@ -50,7 +52,7 @@ rtems_task Init(
   rtems_id             extension;
   rtems_id             task_id;
 
-  puts( "\n\n*** TEST 56 ***" );
+  TEST_BEGIN();
 
   puts( "Init - rtems_extension_create - OK" );
   status = rtems_extension_create(
@@ -74,7 +76,7 @@ rtems_task Init(
   puts( "Init - rtems_extension_delete - OK" );
   status = rtems_extension_delete( extension );
   directive_failed( status, "rtems_extension_delete" );
-  puts( "*** END OF TEST 56 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -85,6 +87,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS             2
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS   1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp57/init.c b/testsuites/sptests/sp57/init.c
index aa66bf6..3003c2f 100644
--- a/testsuites/sptests/sp57/init.c
+++ b/testsuites/sptests/sp57/init.c
@@ -19,6 +19,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 57";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Delay_task(rtems_task_argument ignored);
@@ -44,7 +46,7 @@ rtems_task Init(
   rtems_status_code    status;
   rtems_id             task_id;
 
-  puts( "\n\n*** TEST 57 ***" );
+  TEST_BEGIN();
 
   puts( "Init - rtems_task_create - delay task - OK" );
   status = rtems_task_create(
@@ -69,7 +71,7 @@ rtems_task Init(
   status = rtems_task_restart( task_id, 0 );
   directive_failed( status, "rtems_task_restart" );
 
-  puts( "*** END OF TEST 57 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -79,6 +81,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             2
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp58/init.c b/testsuites/sptests/sp58/init.c
index 1459592..b611203 100644
--- a/testsuites/sptests/sp58/init.c
+++ b/testsuites/sptests/sp58/init.c
@@ -16,6 +16,8 @@
 #include <sys/types.h>
 #include <rtems/score/timespec.h>
 
+const char rtems_test_name[] = "SP 58";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void timespec_divide_by_zero(void);
@@ -64,12 +66,12 @@ rtems_task Init(
   rtems_task_argument ignored
 )
 {
-  puts( "\n\n*** TEST 58 ***" );
+  TEST_BEGIN();
 
   timespec_divide_by_zero();
   timespec_greater_than_lhs_sec_less();
 
-  puts( "*** END OF TEST 58 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -79,6 +81,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS  1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp59/init.c b/testsuites/sptests/sp59/init.c
index 238dba3..2e68b9f 100644
--- a/testsuites/sptests/sp59/init.c
+++ b/testsuites/sptests/sp59/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 59";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Blocking_task(rtems_task_argument ignored);
@@ -53,7 +55,7 @@ rtems_task Init(
   void                 *address_1;
   rtems_task_priority   priority;
 
-  puts( "\n\n*** TEST 59 ***" );
+  TEST_BEGIN();
 
   priority = RTEMS_MAXIMUM_PRIORITY / 4;
   priority = (priority * 3) + (priority / 2);
@@ -110,7 +112,7 @@ rtems_task Init(
   status = rtems_task_wake_after( RTEMS_MILLISECONDS_TO_TICKS(1000) );
   directive_failed( status, "rtems_task_wake_after" );
 
-  puts( "*** END OF TEST 59 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -121,6 +123,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS         2
 #define CONFIGURE_MAXIMUM_REGIONS       1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp60/init.c b/testsuites/sptests/sp60/init.c
index 67c5dbf..b015ac1 100644
--- a/testsuites/sptests/sp60/init.c
+++ b/testsuites/sptests/sp60/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 60";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -24,7 +26,7 @@ rtems_task Init(
   rtems_id              period1;
   rtems_id              period2;
 
-  puts( "\n\n*** TEST 60 ***" );
+  TEST_BEGIN();
 
   puts( "Init - rtems_rate_monotonic_create - first period" );
   sc = rtems_rate_monotonic_create(
@@ -56,7 +58,7 @@ rtems_task Init(
   sc = rtems_rate_monotonic_period(period1, RTEMS_PERIOD_STATUS );
   fatal_directive_status(sc, RTEMS_TIMEOUT, "rtems_task_period status");
 
-  puts( "*** END OF TEST 60 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -67,6 +69,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS         1
 #define CONFIGURE_MAXIMUM_PERIODS       2
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp62/init.c b/testsuites/sptests/sp62/init.c
index 47c80d0..7df64df 100644
--- a/testsuites/sptests/sp62/init.c
+++ b/testsuites/sptests/sp62/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include <unistd.h>
 
+const char rtems_test_name[] = "SP 62";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Blocker(rtems_task_argument ignored);
@@ -61,7 +63,7 @@ rtems_task Init(
   uintptr_t          old_size;
   size_t             first_alloc_size;
 
-  puts( "\n\n*** TEST 62 ***" );
+  TEST_BEGIN();
 
   puts( "Init - rtems_task_create Blocker - OK" );
   sc = rtems_task_create(
@@ -136,7 +138,7 @@ rtems_task Init(
   );
   rtems_test_assert( sc == RTEMS_SUCCESSFUL );
 
-  puts( "*** END OF TEST 62 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -147,6 +149,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS         2
 #define CONFIGURE_MAXIMUM_REGIONS       1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp63/init.c b/testsuites/sptests/sp63/init.c
index d906253..9b6dd6f 100644
--- a/testsuites/sptests/sp63/init.c
+++ b/testsuites/sptests/sp63/init.c
@@ -15,6 +15,8 @@
 
 #include <rtems/score/heapimpl.h>
 
+const char rtems_test_name[] = "SP 63";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void test_case_one(void);
@@ -125,7 +127,7 @@ rtems_task Init(
   rtems_task_argument ignored
 )
 {
-  puts( "\n\n*** TEST 63 ***" );
+  TEST_BEGIN();
 
   test_case_one();
 
@@ -133,7 +135,7 @@ rtems_task Init(
 
   test_case_three();
 
-  puts( "*** END OF TEST 63 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -145,6 +147,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS         1
 #define CONFIGURE_MAXIMUM_REGIONS       1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp64/init.c b/testsuites/sptests/sp64/init.c
index d43e50f..153a9f2 100644
--- a/testsuites/sptests/sp64/init.c
+++ b/testsuites/sptests/sp64/init.c
@@ -15,6 +15,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SP 64";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -34,7 +36,7 @@ rtems_task Init(
   rtems_resource_snapshot snapshot;
   void                   *greedy;
 
-  puts( "\n\n*** TEST 64 ***" );
+  TEST_BEGIN();
 
   puts( "Allocate one region -- so second auto extends" );
   sc = rtems_region_create(
@@ -94,7 +96,7 @@ rtems_task Init(
   rtems_test_assert( ok );
   rtems_workspace_greedy_free( greedy );
 
-  puts( "*** END OF TEST 64 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -105,6 +107,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS         1
 #define CONFIGURE_MAXIMUM_REGIONS       rtems_resource_unlimited( 2 )
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MEMORY_OVERHEAD 1
diff --git a/testsuites/sptests/sp65/init.c b/testsuites/sptests/sp65/init.c
index 66ff7d9..cba836d 100644
--- a/testsuites/sptests/sp65/init.c
+++ b/testsuites/sptests/sp65/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include <unistd.h>
 
+const char rtems_test_name[] = "SP 65";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Task_1(rtems_task_argument arg);
@@ -33,7 +35,7 @@ rtems_task Init(
   int                  status;
   rtems_id             Mutex_id, Task_id;
 
-  puts( "\n\n*** TEST " TEST_NAME " ***" );
+  TEST_BEGIN();
 
   /*
    *  Create binary semaphore (a.k.a. Mutex) with Priority Ceiling
@@ -74,7 +76,7 @@ rtems_task Init(
   status = rtems_semaphore_release( Mutex_id );
   directive_failed( status, "rtems_semaphore_release" );
 
-  puts( "*** END OF TEST 65 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -104,6 +106,8 @@ rtems_task Task_1(
 #define CONFIGURE_MAXIMUM_TASKS         2
 #define CONFIGURE_MAXIMUM_SEMAPHORES    1
 #define CONFIGURE_INIT_TASK_PRIORITY    TASK_PRIORITY
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp67/init.c b/testsuites/sptests/sp67/init.c
index 96df7b2..154e836 100644
--- a/testsuites/sptests/sp67/init.c
+++ b/testsuites/sptests/sp67/init.c
@@ -18,6 +18,8 @@
 
 #include <rtems/score/watchdogimpl.h>
 
+const char rtems_test_name[] = "SP 67";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_timer_service_routine TIMER_service_routine(
@@ -46,7 +48,7 @@ rtems_task Init(
   rtems_id          timer1;
   rtems_id          timer2;
 
-  puts( "\n\n*** TEST 67 ***" );
+  TEST_BEGIN();
 
   /* build timer name*/
 
@@ -105,7 +107,7 @@ rtems_task Init(
     rtems_test_exit(0);
   }
 
-  puts( "*** END OF TEST 67 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -117,6 +119,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS              2
 #define CONFIGURE_MAXIMUM_TIMERS             2
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp68/init.c b/testsuites/sptests/sp68/init.c
index be0698f..d028c2d 100644
--- a/testsuites/sptests/sp68/init.c
+++ b/testsuites/sptests/sp68/init.c
@@ -27,6 +27,8 @@
 
 #include <rtems/rtems/timerimpl.h>
 
+const char rtems_test_name[] = "SP 68";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -383,7 +385,7 @@ rtems_task Init(rtems_task_argument argument)
   void *new_region_item = NULL;
   size_t i = 0;
 
-  puts("\n\n*** TEST 68 ***");
+  TEST_BEGIN();
 
   for (i = 0; i < TIMER_COUNT; ++i) {
     sc = rtems_timer_create(
@@ -456,7 +458,7 @@ rtems_task Init(rtems_task_argument argument)
     ++rt;
   }
 
-  puts("*** END OF TEST 68 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -471,6 +473,8 @@ rtems_task Init(rtems_task_argument argument)
 #define CONFIGURE_MAXIMUM_REGIONS 1
 #define CONFIGURE_MAXIMUM_BARRIERS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp69/init.c b/testsuites/sptests/sp69/init.c
index 5379a53..ecc3846 100644
--- a/testsuites/sptests/sp69/init.c
+++ b/testsuites/sptests/sp69/init.c
@@ -15,6 +15,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "SP 69";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -31,7 +33,7 @@ rtems_task Init(
 
   period_name = rtems_build_name('P','E','R','1');
 
-  puts( "\n\n*** TEST 69 ***" );
+  TEST_BEGIN();
 
   /* create period */
   status = rtems_rate_monotonic_create(
@@ -181,7 +183,7 @@ rtems_task Init(
     rtems_test_assert( statistics.missed_count == i );
   }
   
-  puts( "*** END OF TEST 69 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -196,6 +198,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS             1
 #define CONFIGURE_MAXIMUM_PERIODS           1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 
diff --git a/testsuites/sptests/sp70/init.c b/testsuites/sptests/sp70/init.c
index 0a92188..721e3b9 100644
--- a/testsuites/sptests/sp70/init.c
+++ b/testsuites/sptests/sp70/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "SP 70";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void create_helper(int task);
@@ -50,7 +52,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST 70 ***" );
+  TEST_BEGIN();
 
   create_helper( 1 );
   create_helper( 2 );
@@ -69,7 +71,7 @@ rtems_task Init(
   create_helper( 4 );
   create_helper( 5 );
 
-  puts( "*** END OF TEST 70 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -81,6 +83,8 @@ rtems_task Init(
 
 #define CONFIGURE_UNIFIED_WORK_AREAS
 #define CONFIGURE_MAXIMUM_TASKS rtems_resource_unlimited(1)
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp71/init.c b/testsuites/sptests/sp71/init.c
index 0fb43a8..eff6ba7 100644
--- a/testsuites/sptests/sp71/init.c
+++ b/testsuites/sptests/sp71/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "SP 71";
+
 #define PER_ALLOCATION 8000
 
 /* forward declarations to avoid warnings */
@@ -27,7 +29,7 @@ rtems_task Init(
   rtems_id          id;
   long              created;
 
-  puts( "\n\n*** TEST 71 ***" );
+  TEST_BEGIN();
 
   created = 0;
   do {
@@ -53,7 +55,7 @@ rtems_task Init(
 
   if ( (created + PER_ALLOCATION) > OBJECTS_ID_FINAL_INDEX ) {
     puts( "Test case hit" );
-    puts( "*** END OF TEST 71 ***" );
+    TEST_END();
   } else {
     puts( "Test case NOT hit" );
   }
@@ -68,6 +70,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS             1
 #define CONFIGURE_MAXIMUM_PORTS rtems_resource_unlimited(PER_ALLOCATION)
 #define CONFIGURE_UNIFIED_WORK_AREAS
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp72/init.c b/testsuites/sptests/sp72/init.c
index 0f1816d..5e2c8ab 100644
--- a/testsuites/sptests/sp72/init.c
+++ b/testsuites/sptests/sp72/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "SP 72";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Test_task(rtems_task_argument argument);
@@ -43,7 +45,7 @@ rtems_task Init(
   rtems_status_code status;
   rtems_id          task_id;
 
-  puts( "\n\n*** TEST SP72 ***" );
+  TEST_BEGIN();
 
   status = rtems_semaphore_create(
     rtems_build_name( 'S', 'M', '1', ' ' ),
@@ -75,7 +77,7 @@ rtems_task Init(
   status = rtems_task_delete( task_id );
   directive_failed( status, "rtems_task_delete" );
 
-  puts( "*** END OF TEST SP72 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -87,6 +89,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS             2
 #define CONFIGURE_MAXIMUM_SEMAPHORES        1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp73/init.c b/testsuites/sptests/sp73/init.c
index c61c8d5..8db5024 100644
--- a/testsuites/sptests/sp73/init.c
+++ b/testsuites/sptests/sp73/init.c
@@ -15,6 +15,8 @@
 #include <inttypes.h>
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SP 73";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Test_task(rtems_task_argument argument);
@@ -36,7 +38,7 @@ rtems_task Test_task(
     directive_failed( status, "get tod" );
 
     if ( time.second >= 15 ) {
-      puts( "*** END OF SP73 (YIELD) TEST ***" );
+      TEST_END();
       rtems_test_exit( 0 );
     }
     put_name( Task_name[ task_index ], FALSE );
@@ -56,7 +58,7 @@ rtems_task Init(
   rtems_time_of_day   time;
   rtems_task_priority old;
 
-  puts( "\n\n*** SP73 (YIELD) TEST ***" );
+  TEST_BEGIN();
 
   time.year   = 1988;
   time.month  = 12;
@@ -119,6 +121,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS           4
 
 #define CONFIGURE_INIT_TASK_PRIORITY      2
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp74/init.c b/testsuites/sptests/sp74/init.c
index 047f306..346c676 100644
--- a/testsuites/sptests/sp74/init.c
+++ b/testsuites/sptests/sp74/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 74";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Test_task(rtems_task_argument argument);
@@ -23,7 +25,7 @@ rtems_task Test_task(
 {
   puts( "Successfully yielded it to higher priority task" );
 
-  puts( "*** END OF SP74 TEST ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -34,7 +36,7 @@ rtems_task Init(
   rtems_status_code  status;
   rtems_id           id;
 
-  puts( "\n\n*** SP74 (YIELD) TEST ***" );
+  TEST_BEGIN();
 
   puts( "Create TA1 at higher priority task" );
   status = rtems_task_create(
@@ -66,6 +68,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS           3
 #define CONFIGURE_INIT_TASK_PRIORITY      2
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp75/init.c b/testsuites/sptests/sp75/init.c
index 99b5edd..2822586 100644
--- a/testsuites/sptests/sp75/init.c
+++ b/testsuites/sptests/sp75/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "SP 75";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -24,7 +26,7 @@ rtems_task Init(
   rtems_status_code sc;
   rtems_id          mutex;
 
-  puts( "\n\n*** TEST SP75 ***" );
+  TEST_BEGIN();
 
   sc = rtems_semaphore_create(
     rtems_build_name('M', 'U', 'T', 'X'),
@@ -46,7 +48,7 @@ rtems_task Init(
   _Thread_Enable_dispatch();
   directive_failed(sc, "rtems_semaphore_obtain");
 
-  puts( "*** END OF TEST SP75 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -57,6 +59,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS             1
 #define CONFIGURE_MAXIMUM_SEMAPHORES        1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp76/init.c b/testsuites/sptests/sp76/init.c
index 5dd91c5..f657364 100644
--- a/testsuites/sptests/sp76/init.c
+++ b/testsuites/sptests/sp76/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SP 76";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Test_task(rtems_task_argument index);
@@ -30,7 +32,7 @@ rtems_task Test_task(
   put_name( name, FALSE );
   puts( " - Successfully yielded it to higher priority task" );
 
-  puts( "*** END OF SP76 TEST ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -42,7 +44,7 @@ rtems_task Init(
   rtems_id              id;
   rtems_task_priority 	old;
 
-  puts( "\n\n*** SP76 (YIELD) TEST ***" );
+  TEST_BEGIN();
 
   status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &id );
   directive_failed( status, "task ident" );
@@ -96,6 +98,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS           3
 #define CONFIGURE_INIT_TASK_PRIORITY      2
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sp77/init.c b/testsuites/sptests/sp77/init.c
index 71a8ce2..c6ccacc 100644
--- a/testsuites/sptests/sp77/init.c
+++ b/testsuites/sptests/sp77/init.c
@@ -10,6 +10,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "SP 77";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -17,7 +19,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST sp77 ***" );
+  TEST_BEGIN();
 
   rtems_status_code status;
   rtems_id id;
@@ -32,7 +34,7 @@ rtems_task Init(
   
   fatal_directive_check_status_only(status , RTEMS_UNSATISFIED ,
 				    "attempt to create message queue return: ");  
-  puts( "*** END OF TEST sp77 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -43,6 +45,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spassoc01/init.c b/testsuites/sptests/spassoc01/init.c
index 40a74fc..2cd14f9 100644
--- a/testsuites/sptests/spassoc01/init.c
+++ b/testsuites/sptests/spassoc01/init.c
@@ -17,6 +17,8 @@
 #include <stdio.h>
 #include <rtems/assoc.h>
 
+const char rtems_test_name[] = "SPASSOC 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -64,7 +66,7 @@ rtems_task Init(
 )
 {
   name = malloc(40);
-  puts( "\n\n*** TEST ASSOC ROUTINES - 1 ***" );
+  TEST_BEGIN();
 
   puts( "Init - get local by name -- OK" );
   local = rtems_assoc_local_by_name( assoc_table, "zero" );
@@ -215,7 +217,7 @@ rtems_task Init(
 
   free( name );
 
-  puts( "*** END OF TEST ASSOC ROUTINES - 1 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -226,6 +228,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spcache01/init.c b/testsuites/sptests/spcache01/init.c
index d0dddd9..2c9d184 100644
--- a/testsuites/sptests/spcache01/init.c
+++ b/testsuites/sptests/spcache01/init.c
@@ -25,6 +25,8 @@
 #define TESTS_USE_PRINTF
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPCACHE 1";
+
 #define I() __asm__ volatile ("nop")
 
 #define I8() I(); I(); I(); I(); I(); I(); I(); I()
@@ -371,12 +373,12 @@ static void test_timing(void)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST SPCACHE 1 ***");
+  TEST_BEGIN();
 
   test_data_flush_and_invalidate();
   test_timing();
 
-  puts("*** END OF TEST SPCACHE 1 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -388,6 +390,8 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spcbssched01/init.c b/testsuites/sptests/spcbssched01/init.c
index a44a4da..be85bce 100644
--- a/testsuites/sptests/spcbssched01/init.c
+++ b/testsuites/sptests/spcbssched01/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SPCBSSCHED 1";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -33,7 +35,7 @@ rtems_task Init(
   rtems_time_of_day time;
   rtems_status_code status;
 
-  puts( "\n\n*** CBS SCHEDULER TEST 1 ***" );
+  TEST_BEGIN();
 
   build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
   status = rtems_clock_set( &time );
diff --git a/testsuites/sptests/spcbssched01/system.h b/testsuites/sptests/spcbssched01/system.h
index 0134d63..2ba1db5 100644
--- a/testsuites/sptests/spcbssched01/system.h
+++ b/testsuites/sptests/spcbssched01/system.h
@@ -30,6 +30,8 @@ rtems_task Task_1_through_3(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spcbssched01/task1.c b/testsuites/sptests/spcbssched01/task1.c
index df708c5..f5d1808 100644
--- a/testsuites/sptests/spcbssched01/task1.c
+++ b/testsuites/sptests/spcbssched01/task1.c
@@ -41,7 +41,7 @@ rtems_task Task_1_through_3(
     directive_failed( status, "rtems_clock_get_tod" );
 
     if ( time.second >= 35 ) {
-      puts( "*** END OF CBS SCHEDULER TEST 1 ***" );
+      TEST_END();
       rtems_test_exit( 0 );
     }
 
diff --git a/testsuites/sptests/spcbssched02/init.c b/testsuites/sptests/spcbssched02/init.c
index cf70dc2..08b465b 100644
--- a/testsuites/sptests/spcbssched02/init.c
+++ b/testsuites/sptests/spcbssched02/init.c
@@ -23,6 +23,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SPCBSSCHED 2";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -46,7 +48,7 @@ rtems_task Init(
   params3.deadline = -1;
   params4.deadline = SCHEDULER_EDF_PRIO_MSB + 1;
 
-  puts( "\n\n*** TEST CBS SCHEDULER 2 ***" );
+  TEST_BEGIN();
 
   Task_name = rtems_build_name( 'P', 'T', '1', ' ' );
   Task_name2 = rtems_build_name( 'P', 'T', '2', ' ' );
@@ -251,6 +253,6 @@ rtems_task Init(
     printf( "ERROR: CBS CLEANUP\n" );
 
   fflush(stdout);
-  puts( "*** END OF TEST CBS SCHEDULER 2 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/spcbssched02/system.h b/testsuites/sptests/spcbssched02/system.h
index d6a8d3b..dba3d13 100644
--- a/testsuites/sptests/spcbssched02/system.h
+++ b/testsuites/sptests/spcbssched02/system.h
@@ -35,6 +35,8 @@ rtems_task Task_Periodic(
 
 #define CONFIGURE_INIT_TASK_PRIORITY          100
 #define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (6 * 4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spcbssched03/init.c b/testsuites/sptests/spcbssched03/init.c
index 1f5c8e2..5554915 100644
--- a/testsuites/sptests/spcbssched03/init.c
+++ b/testsuites/sptests/spcbssched03/init.c
@@ -25,6 +25,8 @@
 
 #include "cbsparams.h"
 
+const char rtems_test_name[] = "SPCBSSCHED 3";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -32,7 +34,7 @@ rtems_task Init(
   uint32_t    index;
   rtems_status_code status;
 
-  puts( "\n\n*** TEST CBS SCHEDULER 3 ***" );
+  TEST_BEGIN();
 
   build_task_name();
 
diff --git a/testsuites/sptests/spcbssched03/system.h b/testsuites/sptests/spcbssched03/system.h
index b9ceaef..4ad5204 100644
--- a/testsuites/sptests/spcbssched03/system.h
+++ b/testsuites/sptests/spcbssched03/system.h
@@ -39,6 +39,8 @@ rtems_task Tasks_Aperiodic(
 
 #define CONFIGURE_INIT_TASK_PRIORITY          100
 #define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_NO_PREEMPT
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (6 * 4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spcbssched03/tasks_periodic.c b/testsuites/sptests/spcbssched03/tasks_periodic.c
index e06978b..1e310b4 100644
--- a/testsuites/sptests/spcbssched03/tasks_periodic.c
+++ b/testsuites/sptests/spcbssched03/tasks_periodic.c
@@ -154,6 +154,6 @@ rtems_task Tasks_Periodic(
   if ( rtems_cbs_cleanup() )
     printf( "ERROR: CBS CLEANUP\n" );
   fflush(stdout);
-  puts( "*** END OF TEST CBS SCHEDULER 3 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/spchain/init.c b/testsuites/sptests/spchain/init.c
index a5c62ab..ca2e135 100644
--- a/testsuites/sptests/spchain/init.c
+++ b/testsuites/sptests/spchain/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include <rtems/chain.h>
 
+const char rtems_test_name[] = "SPCHAIN";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -298,7 +300,7 @@ rtems_task Init(
   test_node            node1, node2;
   int                  id;
 
-  puts( "\n\n*** TEST OF RTEMS CHAIN API ***" );
+  TEST_BEGIN();
 
   puts( "Init - Initialize chain empty" );
   rtems_chain_initialize_empty( &chain1 );
@@ -333,7 +335,7 @@ rtems_task Init(
   test_chain_node_count();
   test_chain_insert_ordered();
 
-  puts( "*** END OF RTEMS CHAIN API TEST ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -342,6 +344,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_TASKS 1
 
diff --git a/testsuites/sptests/spclock_err02/init.c b/testsuites/sptests/spclock_err02/init.c
index fb21c02..7912ab8 100644
--- a/testsuites/sptests/spclock_err02/init.c
+++ b/testsuites/sptests/spclock_err02/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "SPCLOCK_ERR 2";
+
 /* forward declaration to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -21,7 +23,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST SPCLOCK_ERR02 ***" );
+  TEST_BEGIN();
 
   rtems_time_of_day time;
   rtems_status_code status;
@@ -114,13 +116,15 @@ rtems_task Init(
   directive_failed( status, "rtems_clock_set" );
   print_time( "TA1 - rtems_clock_get_tod - ", &time, " - RTEMS_SUCCESSFUL\n" );
 
-  puts( "*** END OF TEST SPCLOCK_ERR02 ***" );
+  TEST_END();
 }
 
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spclockget/init.c b/testsuites/sptests/spclockget/init.c
index dc2409a..145beed 100644
--- a/testsuites/sptests/spclockget/init.c
+++ b/testsuites/sptests/spclockget/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include "pritime.h"
 
+const char rtems_test_name[] = "SPCLOCKGET";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -26,7 +28,7 @@ rtems_task Init(
   rtems_interval      interval;
   struct timeval      timev;
 
-  puts( "\n\n*** TEST LEGACY RTEMS_CLOCK_GET ***" );
+  TEST_BEGIN();
 
   puts( "Init - clock_set_time" );
   build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
@@ -75,7 +77,7 @@ rtems_task Init(
      timev.tv_sec
   );
 
-  puts( "*** END OF TEST LEGACY RTEMS_CLOCK_GET ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -85,6 +87,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS         1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spcontext01/init.c b/testsuites/sptests/spcontext01/init.c
index fd14b60..f26bc55 100644
--- a/testsuites/sptests/spcontext01/init.c
+++ b/testsuites/sptests/spcontext01/init.c
@@ -18,6 +18,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPCONTEXT 1";
+
 #define ITERATION_COUNT 2000
 
 #define PRIORITY_HIGH 2
@@ -162,11 +164,11 @@ static void Init(rtems_task_argument arg)
 {
   test_context *self = &test_instance;
 
-  puts("\n\n*** TEST SPCONTEXT 1 ***");
+  TEST_BEGIN();
 
   test(self);
 
-  puts("*** END OF TEST SPCONTEXT 1 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -181,6 +183,8 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TASKS 3
 #define CONFIGURE_MAXIMUM_TIMERS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spcoverage/init.c b/testsuites/sptests/spcoverage/init.c
index 5d04e91..a80acec 100644
--- a/testsuites/sptests/spcoverage/init.c
+++ b/testsuites/sptests/spcoverage/init.c
@@ -13,6 +13,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPCOVERAGE";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -20,7 +22,7 @@ rtems_task Init(
   rtems_task_argument ignored
 )
 {
-  puts( "\n\n*** TEST COVERAGE MARKERS ***" );
+  TEST_BEGIN();
 
   puts( "Init - If coverage enabled, call coverage marker methods" );
   #if defined(RTEMS_COVERAGE)
@@ -28,7 +30,7 @@ rtems_task Init(
     end_coverage();
   #endif
 
-  puts( "*** END OF TEST COVERAGE MARKERS ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -38,6 +40,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS         1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spcpucounter01/init.c b/testsuites/sptests/spcpucounter01/init.c
index d1c5489..77a70b3 100644
--- a/testsuites/sptests/spcpucounter01/init.c
+++ b/testsuites/sptests/spcpucounter01/init.c
@@ -25,6 +25,8 @@
 #define TESTS_USE_PRINTF
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPCPUCOUNTER 1";
+
 #define NS_PER_TICK 1000000
 
 static rtems_interval sync_with_clock_tick(void)
@@ -96,12 +98,12 @@ static void test_delay_nanoseconds(void)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST SPCPUCOUNTER 1 ***");
+  TEST_BEGIN();
 
   test_converter();
   test_delay_nanoseconds();
 
-  puts("*** END OF TEST SPCPUCOUNTER 1 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -115,6 +117,8 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_FLOATING_POINT
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spcpuset01/init.c b/testsuites/sptests/spcpuset01/init.c
index acc19df..0102e6c 100644
--- a/testsuites/sptests/spcpuset01/init.c
+++ b/testsuites/sptests/spcpuset01/init.c
@@ -13,6 +13,7 @@
 #include <assert.h>
 #include "system.h"
 
+const char rtems_test_name[] = "SPCPUSET 1";
 
 #if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
 static void test_cpu_zero_case_1(void)
@@ -136,7 +137,7 @@ rtems_task Init(
 {
   size_t    i;
 
-  puts( "*** CPUSET01 Test ***" );
+  TEST_BEGIN();
 
   test_cpu_zero_case_1();
   test_cpu_fill_case_1();
@@ -150,7 +151,7 @@ rtems_task Init(
 
   cpuset_logic_test();
 
-  puts( "*** END OF CPUSET01 Test ***" );
+  TEST_END();
   exit( 0 );
 }
 #else
@@ -159,9 +160,9 @@ rtems_task Init(
   rtems_task_argument ignored
 )
 {
-  puts( "*** CPUSET01 Test ***" );
+  TEST_BEGIN();
   puts( "  cpuset not supported\n" );
-  puts( "*** END OF CPUSET01 Test ***" );
+  TEST_END();
   exit( 0 );
 }
 #endif
diff --git a/testsuites/sptests/spcpuset01/system.h b/testsuites/sptests/spcpuset01/system.h
index d2f9867..85fcf05 100644
--- a/testsuites/sptests/spcpuset01/system.h
+++ b/testsuites/sptests/spcpuset01/system.h
@@ -36,6 +36,8 @@ void cpuset_logic_test(void);
 #define CONFIGURE_MAXIMUM_TASKS            1
 #define CONFIGURE_MAXIMUM_SEMAPHORES       1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/spedfsched01/init.c b/testsuites/sptests/spedfsched01/init.c
index 94b11c6..04fc5ca 100644
--- a/testsuites/sptests/spedfsched01/init.c
+++ b/testsuites/sptests/spedfsched01/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SPEDFSCHED 1";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -33,7 +35,7 @@ rtems_task Init(
   rtems_time_of_day time;
   rtems_status_code status;
 
-  puts( "\n\n*** EDF SCHEDULER TEST 1 ***" );
+  TEST_BEGIN();
 
   build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
   status = rtems_clock_set( &time );
diff --git a/testsuites/sptests/spedfsched01/system.h b/testsuites/sptests/spedfsched01/system.h
index 4a042be..b930cb1 100644
--- a/testsuites/sptests/spedfsched01/system.h
+++ b/testsuites/sptests/spedfsched01/system.h
@@ -30,6 +30,8 @@ rtems_task Task_1_through_3(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spedfsched01/task1.c b/testsuites/sptests/spedfsched01/task1.c
index 0ba3e02..f5d1808 100644
--- a/testsuites/sptests/spedfsched01/task1.c
+++ b/testsuites/sptests/spedfsched01/task1.c
@@ -41,7 +41,7 @@ rtems_task Task_1_through_3(
     directive_failed( status, "rtems_clock_get_tod" );
 
     if ( time.second >= 35 ) {
-      puts( "*** END OF EDF SCHEDULER TEST 1 ***" );
+      TEST_END();
       rtems_test_exit( 0 );
     }
 
diff --git a/testsuites/sptests/spedfsched02/init.c b/testsuites/sptests/spedfsched02/init.c
index 6011f45..d112410 100644
--- a/testsuites/sptests/spedfsched02/init.c
+++ b/testsuites/sptests/spedfsched02/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SPEDFSCHED 2";
+
 rtems_task_priority Prio[7] = { 0,   2,   2,   2,   2,  100, 1 };
 
 rtems_task Init(
@@ -37,7 +39,7 @@ rtems_task Init(
 
   Priorities = Prio;
 
-  puts( "\n\n*** TEST EDF Scheduler 2 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/sptests/spedfsched02/system.h b/testsuites/sptests/spedfsched02/system.h
index 3f65a75..3ffcf82 100644
--- a/testsuites/sptests/spedfsched02/system.h
+++ b/testsuites/sptests/spedfsched02/system.h
@@ -43,6 +43,8 @@ void Get_all_counters( void );
 
 #define CONFIGURE_INIT_TASK_PRIORITY          10
 #define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (6 * 4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spedfsched02/task1.c b/testsuites/sptests/spedfsched02/task1.c
index 703c39b..8ced5f7 100644
--- a/testsuites/sptests/spedfsched02/task1.c
+++ b/testsuites/sptests/spedfsched02/task1.c
@@ -118,7 +118,7 @@ rtems_task Task_1_through_6(
         fflush( stdout );
 
         if ( pass == 10 ) {
-          puts( "*** END OF TEST EDF SCHEDULER 2 ***" );
+          TEST_END();
           rtems_test_exit( 0 );
         }
 
diff --git a/testsuites/sptests/spedfsched03/init.c b/testsuites/sptests/spedfsched03/init.c
index 4d4e15f..0c2425a 100644
--- a/testsuites/sptests/spedfsched03/init.c
+++ b/testsuites/sptests/spedfsched03/init.c
@@ -25,6 +25,8 @@
 
 #include "edfparams.h"
 
+const char rtems_test_name[] = "SPEDFSCHED 3";
+
 rtems_task Init(
   rtems_task_argument argument
 )
@@ -32,7 +34,7 @@ rtems_task Init(
   uint32_t    index;
   rtems_status_code status;
 
-  puts( "\n\n*** TEST EDF SCHEDULER 3 ***" );
+  TEST_BEGIN();
 
   build_task_name();
 
diff --git a/testsuites/sptests/spedfsched03/system.h b/testsuites/sptests/spedfsched03/system.h
index a093cd5..95922ae 100644
--- a/testsuites/sptests/spedfsched03/system.h
+++ b/testsuites/sptests/spedfsched03/system.h
@@ -39,6 +39,8 @@ rtems_task Tasks_Aperiodic(
 
 #define CONFIGURE_INIT_TASK_PRIORITY          100
 #define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_NO_PREEMPT
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (6 * 4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spedfsched03/tasks_periodic.c b/testsuites/sptests/spedfsched03/tasks_periodic.c
index f9ccee0..21eb7df 100644
--- a/testsuites/sptests/spedfsched03/tasks_periodic.c
+++ b/testsuites/sptests/spedfsched03/tasks_periodic.c
@@ -79,6 +79,6 @@ rtems_task Tasks_Periodic(
     rtems_test_exit( 0 );
   }
   fflush(stdout);
-  puts( "*** END OF TEST EDF SCHEDULER 3 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sperror01/init.c b/testsuites/sptests/sperror01/init.c
index cdc17d3..1f3e3f9 100644
--- a/testsuites/sptests/sperror01/init.c
+++ b/testsuites/sptests/sperror01/init.c
@@ -16,6 +16,8 @@
 #include "rtems/error.h"
 #include <errno.h>
 
+const char rtems_test_name[] = "SPERROR 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -23,7 +25,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST Tests for error reporting routines - 01 ***" );
+  TEST_BEGIN();
 
   errno = -1;
   rtems_error(RTEMS_ERROR_ERRNO, "Dummy: Resources unavailable");
@@ -51,6 +53,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sperror02/init.c b/testsuites/sptests/sperror02/init.c
index 22f24fb..d4f74f5 100644
--- a/testsuites/sptests/sperror02/init.c
+++ b/testsuites/sptests/sperror02/init.c
@@ -16,6 +16,8 @@
 #include <errno.h>
 #include <rtems/error.h>
 
+const char rtems_test_name[] = "SPERROR 2";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -23,7 +25,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST Tests for error reporting routines - 02 ***" );
+  TEST_BEGIN();
 
   errno = ENOMEM;
   rtems_error(
@@ -42,6 +44,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sperror03/init.c b/testsuites/sptests/sperror03/init.c
index 3f77040..61b405d 100644
--- a/testsuites/sptests/sperror03/init.c
+++ b/testsuites/sptests/sperror03/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "SPERROR 3";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -21,7 +23,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST Tests for error reporting routines - 03 ***" );
+  TEST_BEGIN();
 
   rtems_panic(
     "Dummy panic\n"
@@ -38,6 +40,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/speventsystem01/init.c b/testsuites/sptests/speventsystem01/init.c
index 2f15913..7fb2429 100644
--- a/testsuites/sptests/speventsystem01/init.c
+++ b/testsuites/sptests/speventsystem01/init.c
@@ -20,6 +20,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPEVENTSYSTEM 1";
+
 #define EVENT RTEMS_EVENT_0
 
 static void test_with_normal_and_system_event(void)
@@ -110,7 +112,7 @@ static void test_get_pending_events(void)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST SPEVENTSYSTEM 1 ***");
+  TEST_BEGIN();
 
   test_with_normal_and_system_event();
   test_with_timeout();
@@ -118,7 +120,7 @@ static void Init(rtems_task_argument arg)
   test_with_invalid_address();
   test_get_pending_events();
 
-  puts("*** END OF TEST SPEVENTSYSTEM 1 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -128,6 +130,8 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MAXIMUM_TASKS 2
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/speventtransient01/init.c b/testsuites/sptests/speventtransient01/init.c
index 4e0e9fd..91d6ecf 100644
--- a/testsuites/sptests/speventtransient01/init.c
+++ b/testsuites/sptests/speventtransient01/init.c
@@ -20,6 +20,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPEVENTTRANSIENT 1";
+
 typedef struct {
   rtems_id client;
   bool complete;
@@ -105,13 +107,13 @@ static void test_with_timeout(void)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST SPEVENTTRANSIENT 1 ***");
+  TEST_BEGIN();
 
   test_with_request_server();
   test_with_request_self();
   test_with_timeout();
 
-  puts("*** END OF TEST SPEVENTTRANSIENT 1 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -121,6 +123,8 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MAXIMUM_TASKS 2
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spfatal03/testcase.h b/testsuites/sptests/spfatal03/testcase.h
index 99bf854..b9f1c22 100644
--- a/testsuites/sptests/spfatal03/testcase.h
+++ b/testsuites/sptests/spfatal03/testcase.h
@@ -9,8 +9,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
 #define CONFIGURE_MAXIMUM_SEMAPHORES 10
 
 #define FATAL_ERROR_TEST_NAME            "3"
diff --git a/testsuites/sptests/spfatal16/testcase.h b/testsuites/sptests/spfatal16/testcase.h
index ba1eb11..65af957 100644
--- a/testsuites/sptests/spfatal16/testcase.h
+++ b/testsuites/sptests/spfatal16/testcase.h
@@ -11,6 +11,8 @@
  *    rtems_semaphore_create( rtems_build_name ('T', 'R', 'r', c),...);
  */
 
+#include <rtems/test.h>
+
 #define FATAL_ERROR_TEST_NAME            "16"
 #define FATAL_ERROR_DESCRIPTION          "termios sem create #1"
 #define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_RTEMS_API
@@ -23,6 +25,6 @@
 void force_error()
 {
   /* This fatal error depends on the Termios device configuration */
-  printk( "*** END OF TEST FATAL " FATAL_ERROR_TEST_NAME " ***\n" );
+  rtems_test_endk();
   rtems_test_exit(0);
 }
diff --git a/testsuites/sptests/spfatal26/init.c b/testsuites/sptests/spfatal26/init.c
index 611070b..7235f8d 100644
--- a/testsuites/sptests/spfatal26/init.c
+++ b/testsuites/sptests/spfatal26/init.c
@@ -22,6 +22,8 @@
 
 #include <rtems.h>
 
+const char rtems_test_name[] = "SPFATAL 26";
+
 static void provoke_aligment_or_data_access_exception( void )
 {
   uintptr_t one = 1;
@@ -49,7 +51,7 @@ static void provoke_aligment_or_data_access_exception( void )
 
 static void Init( rtems_task_argument arg )
 {
-  printk( "\n\n*** TEST SPFATAL 26 ***\n" );
+  rtems_test_begink();
 
   provoke_aligment_or_data_access_exception();
 
@@ -67,10 +69,12 @@ static void fatal_extension(
 
   rtems_exception_frame_print( (const rtems_exception_frame *) code );
 
-  printk( "*** END OF TEST SPFATAL 26 ***\n" );
+  rtems_test_endk();
 }
 
-#define CONFIGURE_INITIAL_EXTENSIONS { .fatal = fatal_extension }
+#define CONFIGURE_INITIAL_EXTENSIONS \
+  { .fatal = fatal_extension }, \
+  RTEMS_TEST_INITIAL_EXTENSION
 
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c
index 6a6f340..5f390ad 100644
--- a/testsuites/sptests/spfatal_support/init.c
+++ b/testsuites/sptests/spfatal_support/init.c
@@ -14,13 +14,15 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = FATAL_ERROR_TEST_NAME;
+
 static void print_test_begin_message(void)
 {
   static bool done = false;
 
   if (!done) {
     done = true;
-    printk( "\n\n\n*** TEST FATAL " FATAL_ERROR_TEST_NAME " ***\n" );
+    rtems_test_begink();
   }
 }
 
@@ -105,7 +107,7 @@ void Fatal_extension(
       && is_internal == FATAL_ERROR_EXPECTED_IS_INTERNAL
       && is_expected_error( error )
   ) {
-    printk( "*** END OF TEST FATAL " FATAL_ERROR_TEST_NAME " ***\n" );
+    rtems_test_endk();
   }
 }
 
diff --git a/testsuites/sptests/spfatal_support/system.h b/testsuites/sptests/spfatal_support/system.h
index 407e493..39f6de6 100644
--- a/testsuites/sptests/spfatal_support/system.h
+++ b/testsuites/sptests/spfatal_support/system.h
@@ -15,6 +15,7 @@
  *  Some of the fatal error cases require the ability to peek inside RTEMS
  */
 #include <rtems.h>
+#include <rtems/test.h>
 #include <tmacros.h>
 
 /* functions */
@@ -65,7 +66,8 @@ extern rtems_extensions_table initial_extensions;
     NULL,                    /* begin   */ \
     NULL,                    /* exitted */ \
     Fatal_extension          /* fatal   */ \
-  }
+  }, \
+  RTEMS_TEST_INITIAL_EXTENSION
 
 /* extra parameters may be in testcase.h */
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
diff --git a/testsuites/sptests/spfifo01/init.c b/testsuites/sptests/spfifo01/init.c
index 182885d..a978006 100644
--- a/testsuites/sptests/spfifo01/init.c
+++ b/testsuites/sptests/spfifo01/init.c
@@ -19,6 +19,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPFIFO 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -29,7 +31,7 @@ static void test_main(void)
   mode_t rwx = S_IRWXU | S_IRWXG | S_IRWXO;
   int status;
 
-  puts("\n\n*** FIFO / PIPE OPEN TEST - 1 ***");
+  TEST_BEGIN();
 
   puts(
     "\nConfiguration: Pipes disabled.\n"
@@ -47,7 +49,7 @@ static void test_main(void)
   rtems_test_assert(status == -1);
   rtems_test_assert(errno == ENOSYS);
 
-  puts("*** END OF FIFO / PIPE OPEN TEST - 1 ***");
+  TEST_END();
 }
 
 rtems_task Init(rtems_task_argument not_used)
@@ -65,6 +67,8 @@ rtems_task Init(rtems_task_argument not_used)
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spfifo02/init.c b/testsuites/sptests/spfifo02/init.c
index aa1f667..b08443a 100644
--- a/testsuites/sptests/spfifo02/init.c
+++ b/testsuites/sptests/spfifo02/init.c
@@ -21,6 +21,8 @@
 #include <errno.h>
 #include <rtems/libcsupport.h>
 
+const char rtems_test_name[] = "SPFIFO 2";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void create_all_barriers(void);
@@ -142,7 +144,7 @@ rtems_task Init(
   int num_opens = 0;
   int index = 0;
 
-  puts( "\n\n*** TEST FIFO 02 ***" );
+  TEST_BEGIN();
 
   puts( "Creating all barriers" );
   create_all_barriers();
@@ -196,7 +198,7 @@ rtems_task Init(
     ++index;
   } while ( index < NUM_OPEN_REQ - num_opens );
 
-  puts( "*** END OF TEST FIFO 08 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -207,6 +209,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
diff --git a/testsuites/sptests/spfifo03/init.c b/testsuites/sptests/spfifo03/init.c
index 8499b34..72e9f62 100644
--- a/testsuites/sptests/spfifo03/init.c
+++ b/testsuites/sptests/spfifo03/init.c
@@ -23,6 +23,8 @@
 #include <rtems.h>
 #include <rtems/libio.h>
 
+const char rtems_test_name[] = "SPFIFO 3";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task read_task(rtems_task_argument not_used);
@@ -112,7 +114,7 @@ void test_main(void) /* Also acts as the write task */
 
   rtems_test_assert( status == RTEMS_SUCCESSFUL );
 
-  puts("\n\n*** FIFO / PIPE OPEN TEST - 6 ***");
+  TEST_BEGIN();
 
   puts("\nCreating a task name and a task");
   readTaskName = rtems_build_name('T','A','r',' ');
@@ -189,7 +191,7 @@ void test_main(void) /* Also acts as the write task */
   status = rmdir("/tmp");
   rtems_test_assert(status == 0);
   
-  puts("\n*** END OF FIFO / PIPE OPEN TEST - 6 ***");
+  TEST_END();
 }
 
 rtems_task Init(
@@ -208,6 +210,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS 3
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MAXIMUM_BARRIERS 1
diff --git a/testsuites/sptests/spfifo04/init.c b/testsuites/sptests/spfifo04/init.c
index 9695756..3ed9f41 100644
--- a/testsuites/sptests/spfifo04/init.c
+++ b/testsuites/sptests/spfifo04/init.c
@@ -23,6 +23,8 @@
 #include <rtems.h>
 #include <rtems/libio.h>
 
+const char rtems_test_name[] = "SPFIFO 4";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -38,7 +40,7 @@ rtems_task Init(
   int pipe_length = -1;
   int flag = 1;
 
-  puts( "\n\n*** TEST PIPE/FIFO - 04 ***" );
+  TEST_BEGIN();
 
   puts( "Init - Creating /fifo" );
   status = mkfifo( "/fifo", 0777 );
@@ -90,7 +92,7 @@ rtems_task Init(
   status = unlink( "/fifo" );
   rtems_test_assert( status == 0 );
 
-  puts( "*** END OF TEST PIPE/FIFO - 04 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -104,6 +106,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_BARRIERS 1
 #define CONFIGURE_MAXIMUM_FIFOS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_FIFOS_ENABLED
diff --git a/testsuites/sptests/spfifo05/init.c b/testsuites/sptests/spfifo05/init.c
index c3c1ed7..9f369e0 100644
--- a/testsuites/sptests/spfifo05/init.c
+++ b/testsuites/sptests/spfifo05/init.c
@@ -24,6 +24,8 @@
 #include <rtems.h>
 #include <rtems/libio.h>
 
+const char rtems_test_name[] = "SPFIFO 5";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task read_task(rtems_task_argument not_used);
@@ -134,7 +136,7 @@ rtems_task Init(
   uint32_t released = 0;
   int flag = 1;
 
-  puts("\n*** FIFO / PIPE TESTS - 5 ***");
+  TEST_BEGIN();
 
   memset( sendBuf, '1', SEND_RCV_BUFSIZ - 30 );
   memset( sendBuf, '2', 29 );
@@ -251,7 +253,7 @@ rtems_task Init(
   status = unlink("/fifo");
   rtems_test_assert(status == 0);
   
-  puts("*** END OF FIFO / PIPE OPEN TEST - 6 ***");
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -263,6 +265,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS 3
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MAXIMUM_BARRIERS 2
diff --git a/testsuites/sptests/spfreechain01/init.c b/testsuites/sptests/spfreechain01/init.c
index d51ce89..434c126 100644
--- a/testsuites/sptests/spfreechain01/init.c
+++ b/testsuites/sptests/spfreechain01/init.c
@@ -16,6 +16,8 @@
 #include <rtems/score/wkspace.h>
 #include <rtems/malloc.h>
 
+const char rtems_test_name[] = "SPFREECHAIN 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 bool my_freechain_extend_with_nothing( Freechain_Control *freechain );
@@ -120,7 +122,7 @@ rtems_task Init(
   rtems_task_argument ignored
                 )
 {
-    puts( "*** START OF RTEMS FREECHAIN API TEST ***" );
+    TEST_BEGIN();
 
     test_node *test_node_p;
     MyFreechain myfc;
@@ -177,7 +179,7 @@ rtems_task Init(
         }
     }
 
-    puts( "*** END OF RTEMS FREECHAIN API TEST ***" );
+    TEST_END();
     rtems_test_exit(0);
 }
 
@@ -187,6 +189,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
 #define CONFIGURE_MEMORY_OVERHEAD sizeof(test_node)
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_TASKS 1
 
diff --git a/testsuites/sptests/spheapprot/init.c b/testsuites/sptests/spheapprot/init.c
index d57ec3e..e7a77fd 100644
--- a/testsuites/sptests/spheapprot/init.c
+++ b/testsuites/sptests/spheapprot/init.c
@@ -22,8 +22,13 @@
 
 #include <bsp.h>
 
+#include <rtems/test.h>
 #include <rtems/score/heapimpl.h>
 
+#include <tmacros.h>
+
+const char rtems_test_name[] = "SPHEAPPROT";
+
 #ifdef HEAP_PROTECTION
   static void test_heap_block_error(Heap_Control *heap, Heap_Block *block)
   {
@@ -121,11 +126,11 @@
 
 static rtems_task Init(rtems_task_argument argument)
 {
-  puts( "\n\n*** TEST HEAP PROTECTION ***" );
+  TEST_BEGIN();
 
   test_heap_protection();
 
-  puts( "*** END OF TEST HEAP PROTECTION ***" );
+  TEST_END();
 
   exit(0);
 }
@@ -140,6 +145,8 @@ static rtems_task Init(rtems_task_argument argument)
 #define CONFIGURE_MAXIMUM_TASKS 2
 #define CONFIGURE_MAXIMUM_DRIVERS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/spinternalerror01/init.c b/testsuites/sptests/spinternalerror01/init.c
index 4bdcfde..15a2315 100644
--- a/testsuites/sptests/spinternalerror01/init.c
+++ b/testsuites/sptests/spinternalerror01/init.c
@@ -19,6 +19,10 @@
 #include <bsp.h>
 #include <bsp/bootcard.h>
 
+#include <rtems/test.h>
+
+const char rtems_test_name[] = "SPINTERNALERROR 1";
+
 #define FATAL_SOURCE 0xdeadbeef
 
 #define FATAL_IS_INTERNAL false
@@ -36,14 +40,14 @@ static void fatal_extension(
   Internal_errors_t error
 )
 {
-  printk( "\n\n*** TEST SPINTERNALERROR 1 ***\n" );
+  rtems_test_begink();
 
   if (
     source == FATAL_SOURCE
       && is_internal == FATAL_IS_INTERNAL
       && error == FATAL_ERROR
   ) {
-    printk( "*** END OF TEST SPINTERNALERROR 1 ***\n" );
+    rtems_test_endk();
   }
 }
 
@@ -56,7 +60,9 @@ static void *idle_body(uintptr_t ignored)
   return NULL;
 }
 
-#define CONFIGURE_INITIAL_EXTENSIONS { .fatal = fatal_extension }
+#define CONFIGURE_INITIAL_EXTENSIONS \
+  { .fatal = fatal_extension }, \
+  RTEMS_TEST_INITIAL_EXTENSION
 
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
diff --git a/testsuites/sptests/spinternalerror02/init.c b/testsuites/sptests/spinternalerror02/init.c
index 1137fab..340a9e3 100644
--- a/testsuites/sptests/spinternalerror02/init.c
+++ b/testsuites/sptests/spinternalerror02/init.c
@@ -20,6 +20,8 @@
 
 #include <rtems.h>
 
+const char rtems_test_name[] = "SPINTERNALERROR 2";
+
 static void test_internal_error_text(void)
 {
   rtems_fatal_code error = 0;
@@ -70,13 +72,13 @@ static void test_status_text(void)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST SPINTERNALERROR 2 ***");
+  TEST_BEGIN();
 
   test_internal_error_text();
   test_fatal_source_text();
   test_status_text();
 
-  puts("*** END OF TEST SPINTERNALERROR 2 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -88,6 +90,8 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spintrcritical01/init.c b/testsuites/sptests/spintrcritical01/init.c
index 06ceaf6..7db5143 100644
--- a/testsuites/sptests/spintrcritical01/init.c
+++ b/testsuites/sptests/spintrcritical01/init.c
@@ -22,31 +22,31 @@ rtems_timer_service_routine test_release_from_isr(rtems_id  timer, void *arg);
 Thread_blocking_operation_States getState(void);
 
 #if defined(FIFO_NO_TIMEOUT)
-  #define TEST_NAME                "01"
+  #define TEST_NAME                "1"
   #define TEST_STRING              "FIFO/Without Timeout"
   #define SEMAPHORE_OBTAIN_TIMEOUT 0
   #define SEMAPHORE_ATTRIBUTES     RTEMS_DEFAULT_ATTRIBUTES
 
 #elif defined(FIFO_WITH_TIMEOUT)
-  #define TEST_NAME                "02"
+  #define TEST_NAME                "2"
   #define TEST_STRING              "FIFO/With Timeout"
   #define SEMAPHORE_OBTAIN_TIMEOUT 10
   #define SEMAPHORE_ATTRIBUTES     RTEMS_DEFAULT_ATTRIBUTES
 
 #elif defined(PRIORITY_NO_TIMEOUT)
-  #define TEST_NAME                "03"
+  #define TEST_NAME                "3"
   #define TEST_STRING              "Priority/Without Timeout"
   #define SEMAPHORE_OBTAIN_TIMEOUT 0
   #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
 
 #elif defined(PRIORITY_WITH_TIMEOUT)
-  #define TEST_NAME                "04"
+  #define TEST_NAME                "4"
   #define TEST_STRING              "Priority/With Timeout"
   #define SEMAPHORE_OBTAIN_TIMEOUT 10
   #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
 
 #elif defined(PRIORITY_NO_TIMEOUT_REVERSE)
-  #define TEST_NAME                "05"
+  #define TEST_NAME                "5"
   #define TEST_STRING              "Priority/Without Timeout (Reverse)"
   #define SEMAPHORE_OBTAIN_TIMEOUT 0
   #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
@@ -56,6 +56,8 @@ Thread_blocking_operation_States getState(void);
   #error "Test Mode not defined"
 #endif
 
+const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
+
 rtems_id Main_task;
 rtems_id Semaphore;
 volatile bool case_hit;
@@ -99,7 +101,7 @@ rtems_task Init(
 {
   rtems_status_code     status;
 
-  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_BEGIN();
 
   puts( "Init - Trying to generate semaphore release from ISR while blocking" );
   puts( "Init - Variation is: " TEST_STRING );
@@ -131,7 +133,7 @@ rtems_task Init(
 
   if ( case_hit ) {
     puts( "Init - Case hit" );
-    puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+    TEST_END();
   } else
     puts( "Init - Case not hit - ran too long" );
 
@@ -151,6 +153,8 @@ rtems_task Init(
   #define CONFIGURE_INIT_TASK_PRIORITY   250
 #endif
 #define CONFIGURE_MICROSECONDS_PER_TICK  1000
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c
index 02be2f2..96c2a91 100644
--- a/testsuites/sptests/spintrcritical06/init.c
+++ b/testsuites/sptests/spintrcritical06/init.c
@@ -23,7 +23,7 @@ rtems_task Secondary_task(rtems_task_argument arg);
 #define SEMAPHORE_ATTRIBUTES     RTEMS_PRIORITY
 
 #if defined(PRIORITY_NO_TIMEOUT_FORWARD)
-  #define TEST_NAME          "06"
+  #define TEST_NAME          "6"
   #define TEST_STRING        "Priority/Restart Search Task (Forward)"
 
   #define INIT_PRIORITY      2
@@ -31,7 +31,7 @@ rtems_task Secondary_task(rtems_task_argument arg);
   #define SEMAPHORE_OBTAIN_TIMEOUT 2
 
 #elif defined(PRIORITY_NO_TIMEOUT_REVERSE)
-  #define TEST_NAME          "07"
+  #define TEST_NAME          "7"
   #define TEST_STRING        "Priority/Restart Search Task (Backward)"
   #define INIT_PRIORITY      126
   #define BLOCKER_PRIORITY   127
@@ -42,6 +42,8 @@ rtems_task Secondary_task(rtems_task_argument arg);
   #error "Test Mode not defined"
 #endif
 
+const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
+
 rtems_id Secondary_task_id;
 rtems_id Semaphore;
 
@@ -76,7 +78,7 @@ rtems_task Init(
   rtems_status_code     status;
   int                   resets;
 
-  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_BEGIN();
 
   puts( "Init - Trying to generate semaphore release from ISR while blocking" );
   puts( "Init - There is no way for the test to know if it hits the case" );
@@ -116,7 +118,7 @@ rtems_task Init(
     );
   }
 
-  puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -131,6 +133,8 @@ rtems_task Init(
 #define CONFIGURE_INIT_TASK_PRIORITY  INIT_PRIORITY
 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_PREEMPT
 #define CONFIGURE_MICROSECONDS_PER_TICK  2000
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spintrcritical08/init.c b/testsuites/sptests/spintrcritical08/init.c
index 8d886d2..e286e86 100644
--- a/testsuites/sptests/spintrcritical08/init.c
+++ b/testsuites/sptests/spintrcritical08/init.c
@@ -15,6 +15,8 @@
 #include <intrcritical.h>
 #include <rtems/rtems/ratemonimpl.h>
 
+const char rtems_test_name[] = "SPINTRCRITICAL 8";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_timer_service_routine test_release_from_isr(rtems_id  timer, void *arg);
@@ -56,7 +58,7 @@ rtems_task Init(
   rtems_status_code     sc;
   int                   resets;
 
-  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION 08 ***" );
+  TEST_BEGIN();
 
   puts( "Init - Trying to generate period ending while blocking" );
 
@@ -85,7 +87,7 @@ rtems_task Init(
 
   if ( case_hit ) {
     puts( "Init - It appears the case has been hit" );
-    puts( "*** END OF TEST INTERRUPT CRITICAL SECTION 08 ***" );
+    TEST_END();
   } else
     puts( "Init - Case not hit - ran too long" );
   rtems_test_exit(0);
@@ -100,6 +102,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TIMERS      1
 #define CONFIGURE_MAXIMUM_PERIODS     1
 #define CONFIGURE_MICROSECONDS_PER_TICK  1000
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spintrcritical09/init.c b/testsuites/sptests/spintrcritical09/init.c
index 26e8a4b..90948ec 100644
--- a/testsuites/sptests/spintrcritical09/init.c
+++ b/testsuites/sptests/spintrcritical09/init.c
@@ -17,6 +17,8 @@
 #include <rtems/rtems/semimpl.h>
 #include <rtems/score/watchdogimpl.h>
 
+const char rtems_test_name[] = "SPINTRCRITICAL 9";
+
 static rtems_id Semaphore;
 static bool case_hit;
 
@@ -69,7 +71,7 @@ static rtems_task Init(
   rtems_status_code     sc;
   int                   resets;
 
-  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION 09 ***" );
+  TEST_BEGIN();
 
   puts( "Init - Test may not be able to detect case is hit reliably" );
   puts( "Init - Trying to generate timeout from ISR while blocking" );
@@ -95,7 +97,7 @@ static rtems_task Init(
 
   if ( case_hit ) {
     puts( "Init - It appears the case has been hit" );
-    puts( "*** END OF TEST INTERRUPT CRITICAL SECTION 09 ***" );
+    TEST_END();
   } else
     puts( "Init - Case not hit - ran too long" );
 
@@ -110,6 +112,8 @@ static rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS       1
 #define CONFIGURE_MAXIMUM_TIMERS      1
 #define CONFIGURE_MAXIMUM_SEMAPHORES  1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MICROSECONDS_PER_TICK  1000
 
diff --git a/testsuites/sptests/spintrcritical10/init.c b/testsuites/sptests/spintrcritical10/init.c
index c44f0ae..f3883f7 100644
--- a/testsuites/sptests/spintrcritical10/init.c
+++ b/testsuites/sptests/spintrcritical10/init.c
@@ -18,6 +18,8 @@
 
 #include <rtems/rtems/eventimpl.h>
 
+const char rtems_test_name[] = "SPINTRCRITICAL 10";
+
 #define GREEN RTEMS_EVENT_0
 
 #define RED RTEMS_EVENT_1
@@ -304,7 +306,7 @@ static rtems_task Init(
     .thread = _Thread_Get_executing()
   };
 
-  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION 10 ***" );
+  TEST_BEGIN();
 
   sc = rtems_timer_create(rtems_build_name('T', 'I', 'M', 'R'), &ctx.timer);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
@@ -313,7 +315,7 @@ static rtems_task Init(
   test_all_satisfy_before_timeout(&ctx);
   test_timeout_before_all_satisfy(&ctx);
 
-  puts( "*** END OF TEST INTERRUPT CRITICAL SECTION 10 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -324,6 +326,8 @@ static rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS       1
 #define CONFIGURE_MAXIMUM_TIMERS      1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MICROSECONDS_PER_TICK  1000
 
diff --git a/testsuites/sptests/spintrcritical11/init.c b/testsuites/sptests/spintrcritical11/init.c
index fde88b1..0d89875 100644
--- a/testsuites/sptests/spintrcritical11/init.c
+++ b/testsuites/sptests/spintrcritical11/init.c
@@ -37,6 +37,8 @@ rtems_id Main_task;
 
 #endif
 
+const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
+
 rtems_timer_service_routine test_release_from_isr(
   rtems_id  timer,
   void     *arg
@@ -52,7 +54,7 @@ rtems_task Init(
   rtems_event_set       out;
   int                   resets;
 
-  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_BEGIN();
 
   puts( "Init - Test may not be able to detect case is hit reliably" );
   puts( "Init - Trying to generate event send from ISR while blocking" );
@@ -69,7 +71,7 @@ rtems_task Init(
     (void) rtems_event_receive( EVENTS_TO_RECEIVE, RTEMS_EVENT_ANY, 1, &out );
   }
 
-  puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -81,6 +83,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS       2
 #define CONFIGURE_MAXIMUM_TIMERS      1
 #define CONFIGURE_MAXIMUM_SEMAPHORES  1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MICROSECONDS_PER_TICK  1000
 
diff --git a/testsuites/sptests/spintrcritical13/init.c b/testsuites/sptests/spintrcritical13/init.c
index 2cc567b..5a43dab 100644
--- a/testsuites/sptests/spintrcritical13/init.c
+++ b/testsuites/sptests/spintrcritical13/init.c
@@ -28,6 +28,8 @@
   #error "Test Mode not defined"
 #endif
 
+const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_timer_service_routine test_release_from_isr(rtems_id  timer, void *arg);
@@ -58,7 +60,7 @@ rtems_task Init(
   rtems_status_code     sc;
   int                   resets;
 
-  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_BEGIN();
 
   puts( "Init - Trying to generate timer fire from ISR while firing" );
   puts( "Init - Variation is: " TEST_STRING );
@@ -91,7 +93,7 @@ rtems_task Init(
     directive_failed( sc, "rtems_timer_fire_after");
   }
 
-  puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -107,6 +109,8 @@ rtems_task Init(
 #endif
 #define CONFIGURE_MAXIMUM_TIMERS      2
 #define CONFIGURE_MICROSECONDS_PER_TICK  1000
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spintrcritical15/init.c b/testsuites/sptests/spintrcritical15/init.c
index 0f8871e..ec84165 100644
--- a/testsuites/sptests/spintrcritical15/init.c
+++ b/testsuites/sptests/spintrcritical15/init.c
@@ -14,11 +14,12 @@
 #include <tmacros.h>
 #include <intrcritical.h>
 
+const char rtems_test_name[] = "SPINTRCRITICAL 15";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Secondary_task(rtems_task_argument ignored);
 
-#define TEST_NAME          "15"
 #define INIT_PRIORITY      2
 #define BLOCKER_PRIORITY   1
 
@@ -45,8 +46,8 @@ rtems_task Init(
   rtems_status_code     sc;
   int                   resets;
 
+  TEST_BEGIN();
   puts(
-    "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***\n"
     "Init - Trying to generate timeout of a thread while another is blocking\n"
     "Init -   on the same thread queue\n"
     "Init - There is no way for the test to know if it hits the case"
@@ -91,7 +92,7 @@ rtems_task Init(
     fatal_directive_status( sc, RTEMS_TIMEOUT, "rtems_semaphore_obtain" );
   }
 
-  puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -105,6 +106,8 @@ rtems_task Init(
 #define CONFIGURE_MICROSECONDS_PER_TICK  1000
 #define CONFIGURE_INIT_TASK_PRIORITY  INIT_PRIORITY
 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_PREEMPT
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spintrcritical16/init.c b/testsuites/sptests/spintrcritical16/init.c
index 2201ca8..f185800 100644
--- a/testsuites/sptests/spintrcritical16/init.c
+++ b/testsuites/sptests/spintrcritical16/init.c
@@ -16,13 +16,13 @@
 
 #include <rtems/rtems/semimpl.h>
 
+const char rtems_test_name[] = "SPINTRCRITICAL 16";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_timer_service_routine test_release_from_isr(rtems_id  timer, void *arg);
 Thread_blocking_operation_States getState(void);
 
-#define TEST_NAME          "16"
-
 Thread_Control *Main_TCB;
 rtems_id        Main_task;
 rtems_id        Semaphore;
@@ -66,8 +66,8 @@ rtems_task Init(
   rtems_status_code     sc;
   int                   resets;
 
+  TEST_BEGIN();
   puts(
-    "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***\n"
     "Init - Trying to generate timeout of a thread that had its blocking\n"
     "Init -   request satisfied while blocking but before time timeout"
   );
@@ -101,7 +101,7 @@ rtems_task Init(
 
   if ( case_hit ) {
     puts( "Init - Case hit" );
-    puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+    TEST_END();
   } else
     puts( "Init - Case not hit - ran too long" );
 
@@ -118,6 +118,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TIMERS         1
 #define CONFIGURE_MAXIMUM_SEMAPHORES     1
 #define CONFIGURE_MICROSECONDS_PER_TICK  1000
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spintrcritical17/init.c b/testsuites/sptests/spintrcritical17/init.c
index 420c0ac..9dde48a 100644
--- a/testsuites/sptests/spintrcritical17/init.c
+++ b/testsuites/sptests/spintrcritical17/init.c
@@ -20,6 +20,8 @@
 
 #include <rtems/rtems/timerimpl.h>
 
+const char rtems_test_name[] = "SPINTRCRITICAL 17";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -76,7 +78,7 @@ static void trigger_callback(rtems_id timer_id, void *arg)
   rtems_status_code sc = RTEMS_SUCCESSFUL;
 
   if (case_hit) {
-    puts("*** END OF INTERRUPT CRITICAL SECTION 17 ***");
+    TEST_END();
 
     rtems_test_exit(0);
   } else if (interrupt_critical_section_test_support_delay()) {
@@ -94,7 +96,7 @@ rtems_task Init( rtems_task_argument ignored )
   rtems_status_code sc = RTEMS_SUCCESSFUL;
   size_t i = 0;
 
-  puts("\n\n*** TEST INTERRUPT CRITICAL SECTION 17 ***");
+  TEST_BEGIN();
 
   build_time(&tod, 4, 12, 2009, 9, 34, 11, 0);
   sc = rtems_clock_set(&tod);
@@ -156,6 +158,8 @@ rtems_task Init( rtems_task_argument ignored )
 #define CONFIGURE_MAXIMUM_TASKS 2
 #define CONFIGURE_MAXIMUM_TIMERS 4
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spintrcritical18/init.c b/testsuites/sptests/spintrcritical18/init.c
index 7b6400e..c34f4b9 100644
--- a/testsuites/sptests/spintrcritical18/init.c
+++ b/testsuites/sptests/spintrcritical18/init.c
@@ -19,7 +19,7 @@
 #include <tmacros.h>
 #include <intrcritical.h>
 
-#define TEST_NAME "18"
+const char rtems_test_name[] = "SPINTRCRITICAL 18";
 
 #define WAKE_UP RTEMS_EVENT_0
 
@@ -101,7 +101,7 @@ static void Init( rtems_task_argument ignored )
   rtems_status_code sc;
   int resets = 0;
 
-  puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***\n" );
+  TEST_BEGIN();
 
   sc = rtems_task_create(
     rtems_build_name( 'H', 'I', 'G', 'H' ),
@@ -149,7 +149,7 @@ static void Init( rtems_task_argument ignored )
     wake_up( ctx->middle_priority_task );
   }
 
-  puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
 }
@@ -166,6 +166,8 @@ static void Init( rtems_task_argument ignored )
 #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES
 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spintrcritical19/init.c b/testsuites/sptests/spintrcritical19/init.c
index 8d708bb..4d2eca8 100644
--- a/testsuites/sptests/spintrcritical19/init.c
+++ b/testsuites/sptests/spintrcritical19/init.c
@@ -20,7 +20,7 @@
 #include <intrcritical.h>
 #include <rtems/score/statesimpl.h>
 
-#define TEST_NAME "19"
+const char rtems_test_name[] = "SPINTRCRITICAL 19";
 
 #define PRIORITY_RED 1
 
@@ -68,7 +68,7 @@ static void Init(rtems_task_argument ignored)
   int resets = 0;
   rtems_status_code sc;
 
-  puts("\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***\n");
+  TEST_BEGIN();
 
   ctx->master_task = rtems_task_self();
   ctx->master_task_tcb = _Thread_Get_executing();
@@ -110,7 +110,7 @@ static void Init(rtems_task_argument ignored)
   sc = rtems_task_delete(ctx->resumer_task);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
-  puts("*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -127,6 +127,8 @@ static void Init(rtems_task_argument ignored)
 #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES
 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spintrcritical20/init.c b/testsuites/sptests/spintrcritical20/init.c
index 1fedd39..cae8fdb 100644
--- a/testsuites/sptests/spintrcritical20/init.c
+++ b/testsuites/sptests/spintrcritical20/init.c
@@ -21,7 +21,7 @@
 #include <rtems/score/threadqimpl.h>
 #include <rtems/rtems/semimpl.h>
 
-#define TEST_NAME "20"
+const char rtems_test_name[] = "SPINTRCRITICAL 20";
 
 #define PRIORITY_MASTER 2
 
@@ -69,7 +69,7 @@ static void Init(rtems_task_argument ignored)
   int resets = 0;
   rtems_status_code sc;
 
-  puts("\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***\n");
+  TEST_BEGIN();
 
   ctx->master_task = rtems_task_self();
 
@@ -140,7 +140,7 @@ static void Init(rtems_task_argument ignored)
   rtems_test_assert(ctx->status_was_successful);
   rtems_test_assert(ctx->status_was_timeout);
 
-  puts("*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -158,6 +158,8 @@ static void Init(rtems_task_argument ignored)
 #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES
 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spmkdir/init.c b/testsuites/sptests/spmkdir/init.c
index 0209b02..1d12f6e 100644
--- a/testsuites/sptests/spmkdir/init.c
+++ b/testsuites/sptests/spmkdir/init.c
@@ -31,6 +31,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPMKDIR";
+
 static void test_mkdir(const char *path, mode_t omode, int expected_rv)
 {
   struct stat st;
@@ -54,7 +56,7 @@ static rtems_task Init(rtems_task_argument argument)
   mode_t omode = S_IRWXU | S_IRWXG | S_IRWXO;
   int rv = 0;
 
-  puts("\n\n*** TEST SPMKDIR ***");
+  TEST_BEGIN();
 
   puts( "rtems_mkdir a - OK" );
   test_mkdir("a", omode, 0);
@@ -97,7 +99,7 @@ static rtems_task Init(rtems_task_argument argument)
   test_mkdir("b", omode, -1);
   rtems_test_assert(errno == EEXIST);
 
-  puts("*** END OF TEST SPMKDIR ***");
+  TEST_END();
 
   exit(0);
 }
@@ -114,6 +116,8 @@ static rtems_task Init(rtems_task_argument argument)
 #define CONFIGURE_MAXIMUM_TASKS 1
 #define CONFIGURE_MAXIMUM_DRIVERS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/spmountmgr01/init.c b/testsuites/sptests/spmountmgr01/init.c
index 4b11f31..2330ca8 100644
--- a/testsuites/sptests/spmountmgr01/init.c
+++ b/testsuites/sptests/spmountmgr01/init.c
@@ -18,6 +18,8 @@
 #include <rtems/libcsupport.h>
 #include <rtems/malloc.h>
 
+const char rtems_test_name[] = "SPMOUNTMGR 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 int fs_mount(
@@ -40,7 +42,7 @@ rtems_task Init(
   int status = 0;
   void *greedy;
 
-  puts( "\n\n*** TEST MOUNT MANAGER ROUTINE - 01 ***" );
+  TEST_BEGIN();
 
   puts( "Init - allocating most of heap -- OK" );
   greedy = rtems_heap_greedy_allocate( NULL, 0 );
@@ -114,7 +116,7 @@ rtems_task Init(
   rtems_test_assert( status == -1 );
   rtems_test_assert( errno == ENOENT );
 
-  puts( "*** END OF TEST MOUNT MANAGER ROUTINE - 01 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -124,6 +126,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spnotepad01/init.c b/testsuites/sptests/spnotepad01/init.c
index 27247f1..97a02f5 100644
--- a/testsuites/sptests/spnotepad01/init.c
+++ b/testsuites/sptests/spnotepad01/init.c
@@ -13,6 +13,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPNOTEPAD 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -23,7 +25,7 @@ rtems_task Init(
   rtems_status_code status;
   uint32_t          note;
 
-  puts( "\n\n*** TEST NOTEPADS DISABLED ***" );
+  TEST_BEGIN();
 
   puts( "Init - rtems_task_get_note - RTEMS_NOT_CONFIGURED" );
   status = rtems_task_get_note( rtems_task_self(), 0, &note );
@@ -41,7 +43,7 @@ rtems_task Init(
     "rtems_task_set_note not configured"
   );
 
-  puts( "*** END OF TEST NOTEPADS DISABLED ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -53,6 +55,8 @@ rtems_task Init(
 
 #define CONFIGURE_DISABLE_CLASSIC_API_NOTEPADS
 #define CONFIGURE_MAXIMUM_TASKS         1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spnsext01/init.c b/testsuites/sptests/spnsext01/init.c
index 56c11e9..b9c8877 100644
--- a/testsuites/sptests/spnsext01/init.c
+++ b/testsuites/sptests/spnsext01/init.c
@@ -18,6 +18,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SPNSEXT 1";
+
 static rtems_task Init(rtems_task_argument argument)
 {
   rtems_status_code sc = RTEMS_SUCCESSFUL;
@@ -30,7 +32,7 @@ static rtems_task Init(rtems_task_argument argument)
   struct timespec uptime;
   struct timespec new_uptime;
 
-  puts("\n\n*** TEST NANO SECONDS EXTENSION 1 ***");
+  TEST_BEGIN();
 
   /* Align with clock tick */
   t0 = rtems_clock_get_ticks_since_boot();
@@ -67,7 +69,7 @@ static rtems_task Init(rtems_task_argument argument)
   rtems_interrupt_lock_release(&lock, &lock_context);
   rtems_interrupt_lock_destroy(&lock);
 
-  puts("*** END OF TEST NANO SECONDS EXTENSION 1 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -84,6 +86,8 @@ static rtems_task Init(rtems_task_argument argument)
 #define CONFIGURE_MAXIMUM_TASKS 1
 #define CONFIGURE_MAXIMUM_DRIVERS 2
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/spobjgetnext/init.c b/testsuites/sptests/spobjgetnext/init.c
index 2f0598d..9682c34 100644
--- a/testsuites/sptests/spobjgetnext/init.c
+++ b/testsuites/sptests/spobjgetnext/init.c
@@ -18,6 +18,8 @@
 
 #include <rtems/rtems/tasksimpl.h>
 
+const char rtems_test_name[] = "SPOBJGETNEXT";
+
 /* prototypes */
 int scan_objects(
   Objects_Information *information,
@@ -71,7 +73,7 @@ rtems_task Init(
   Objects_Information  *info;
   Objects_Maximum       active_count;
 
-  puts( "\n\n*** TEST OBJECT GET NEXT ***" );
+  TEST_BEGIN();
 
   info      = &_RTEMS_tasks_Information;
   main_task = rtems_task_self();
@@ -109,6 +111,6 @@ rtems_task Init(
   active_count = _Objects_Active_count( info );
   rtems_test_assert( active_count == 1 );
 
-  puts( "*** END OF TEST OBJECT GET NEXT ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/spobjgetnext/system.h b/testsuites/sptests/spobjgetnext/system.h
index e5d2caf..3282f1c 100644
--- a/testsuites/sptests/spobjgetnext/system.h
+++ b/testsuites/sptests/spobjgetnext/system.h
@@ -20,6 +20,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MAXIMUM_TASKS             2
diff --git a/testsuites/sptests/sppagesize/init.c b/testsuites/sptests/sppagesize/init.c
index cbe29fe..1511c64 100644
--- a/testsuites/sptests/sppagesize/init.c
+++ b/testsuites/sptests/sppagesize/init.c
@@ -15,6 +15,8 @@
 #include <limits.h>
 #include <sys/param.h>
 
+const char rtems_test_name[] = "SPPAGESIZE";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -22,12 +24,12 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-    puts("\n\n*** TEST SPPAGESIZE ***");
+    TEST_BEGIN();
 
     rtems_test_assert(PAGESIZE == PAGE_SIZE);
     rtems_test_assert(getpagesize() == PAGE_SIZE);
 
-    puts("*** END OF TEST SPPAGESIZE ***");
+    TEST_END();
 
     rtems_test_exit(0);
 }
@@ -37,6 +39,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sppartition_err01/init.c b/testsuites/sptests/sppartition_err01/init.c
index 2cb629a..39ee700 100644
--- a/testsuites/sptests/sppartition_err01/init.c
+++ b/testsuites/sptests/sppartition_err01/init.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SPPARTITION_ERR 1";
+
 uint32_t Other_Memory;
 
 TEST_EXTERN rtems_name Partition_name[ 2 ]; /* array of partition names */
@@ -331,10 +333,10 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST PARTITION ERROR 01 ***" );
+  TEST_BEGIN();
 
   test_partition_errors();
 
-  puts( "*** END OF TEST PARTITION ERROR 01 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sppartition_err01/system.h b/testsuites/sptests/sppartition_err01/system.h
index 1a48aa0..71a5f2a 100644
--- a/testsuites/sptests/sppartition_err01/system.h
+++ b/testsuites/sptests/sppartition_err01/system.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_MAXIMUM_TASKS               1
 #define CONFIGURE_MAXIMUM_PARTITIONS          1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/spprintk/init.c b/testsuites/sptests/spprintk/init.c
index 714f680..eb68d12 100644
--- a/testsuites/sptests/spprintk/init.c
+++ b/testsuites/sptests/spprintk/init.c
@@ -142,6 +142,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS           1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spprivenv01/init.c b/testsuites/sptests/spprivenv01/init.c
index 515cc2a..f60bcef 100644
--- a/testsuites/sptests/spprivenv01/init.c
+++ b/testsuites/sptests/spprivenv01/init.c
@@ -17,6 +17,8 @@
 #include <rtems/malloc.h>
 #include <rtems/libcsupport.h>
 
+const char rtems_test_name[] = "SPPRIVENV 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task task_routine(rtems_task_argument not_used);
@@ -44,7 +46,7 @@ rtems_task Init(
   rtems_id                task_id;
   rtems_name              another_task_name;
 
-  puts( "\n\n*** TEST USER ENVIRONMENT ROUTINE - 01 ***" );
+  TEST_BEGIN();
 
   puts( "Init - allocating most of heap -- OK" );
   opaque = rtems_heap_greedy_allocate( NULL, 0 );
@@ -111,7 +113,7 @@ rtems_task Init(
   sc = rtems_libio_share_private_env( task_id );
   rtems_test_assert( sc == RTEMS_SUCCESSFUL );
 
-  puts( "*** END OF TEST USER ENVIRONMENT ROUTINE - 01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -122,6 +124,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             3
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spprofiling01/init.c b/testsuites/sptests/spprofiling01/init.c
index e8df14f..a0e7ce3 100644
--- a/testsuites/sptests/spprofiling01/init.c
+++ b/testsuites/sptests/spprofiling01/init.c
@@ -25,6 +25,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPPROFILING 1";
+
 typedef struct {
   rtems_interrupt_lock a;
   rtems_interrupt_lock b;
@@ -125,12 +127,12 @@ static void test_report_xml(void)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST SPPROFILING 1 ***");
+  TEST_BEGIN();
 
   test_iterate();
   test_report_xml();
 
-  puts("*** END OF TEST SPPROFILING 1 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/sptests/spqreslib/init.c b/testsuites/sptests/spqreslib/init.c
index c6ba68e..680f7be 100644
--- a/testsuites/sptests/spqreslib/init.c
+++ b/testsuites/sptests/spqreslib/init.c
@@ -19,6 +19,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SPQRESLIB";
+
 rtems_id   Task_id;
 rtems_task_priority Priority;
 time_t  Period;
@@ -48,7 +50,7 @@ rtems_task Init(
   params3.P = -1;
   params4.P = SCHEDULER_EDF_PRIO_MSB + 1;
 
-  puts( "\n\n*** TEST QRES LIBRARY ***" );
+  TEST_BEGIN();
 
 
   status = rtems_task_create(
diff --git a/testsuites/sptests/spqreslib/system.h b/testsuites/sptests/spqreslib/system.h
index d7f4421..2687153 100644
--- a/testsuites/sptests/spqreslib/system.h
+++ b/testsuites/sptests/spqreslib/system.h
@@ -35,6 +35,8 @@ rtems_task Task_Periodic(
 
 #define CONFIGURE_INIT_TASK_PRIORITY          100
 #define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (6 * 4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spqreslib/task_periodic.c b/testsuites/sptests/spqreslib/task_periodic.c
index add0f9b..61bc0bb 100644
--- a/testsuites/sptests/spqreslib/task_periodic.c
+++ b/testsuites/sptests/spqreslib/task_periodic.c
@@ -131,6 +131,6 @@ rtems_task Task_Periodic(
     printf( "ERROR: QRES CLEANUP\n" );
 
   fflush(stdout);
-  puts( "*** END OF TEST QRES LIBRARY ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c
index ec2945b..abec11e 100644
--- a/testsuites/sptests/sprbtree01/init.c
+++ b/testsuites/sptests/sprbtree01/init.c
@@ -14,6 +14,8 @@
 #include <rtems/rbtree.h>
 #include <rtems/score/rbtreeimpl.h>
 
+const char rtems_test_name[] = "SPRBTREE 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -101,7 +103,7 @@ rtems_task Init(
   int                  id;
   int i;
 
-  puts( "\n\n*** TEST OF RTEMS RBTREE API ***" );
+  TEST_BEGIN();
 
   puts( "Init - Initialize rbtree empty" );
   rtems_rbtree_initialize_empty( &rbtree1, &test_compare_function, true );
@@ -660,7 +662,7 @@ rtems_task Init(
     rtems_test_exit(0);
   }
 
-  puts( "*** END OF RTEMS RBTREE API TEST ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -669,6 +671,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_TASKS 1
 
diff --git a/testsuites/sptests/spregion_err01/init.c b/testsuites/sptests/spregion_err01/init.c
index 27bd7a9..62ad6e1 100644
--- a/testsuites/sptests/spregion_err01/init.c
+++ b/testsuites/sptests/spregion_err01/init.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SPREGION_ERR 1";
+
 rtems_name Region_name[ 2 ];    /* array of region names */
 rtems_id   Region_id[ 2 ];      /* array of region ids */
 
@@ -435,10 +437,10 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST SPREGION_ERR01 ***" );
+  TEST_BEGIN();
 
   region_error_tests();
 
-  puts( "*** END OF TEST SPREGION_ERR01 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/spregion_err01/system.h b/testsuites/sptests/spregion_err01/system.h
index 0c455b8..97d3e11 100644
--- a/testsuites/sptests/spregion_err01/system.h
+++ b/testsuites/sptests/spregion_err01/system.h
@@ -17,6 +17,8 @@
 #define CONFIGURE_MAXIMUM_TASKS               1
 #define CONFIGURE_MAXIMUM_REGIONS             1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/spsem01/init.c b/testsuites/sptests/spsem01/init.c
index 5775b81..e950890 100644
--- a/testsuites/sptests/spsem01/init.c
+++ b/testsuites/sptests/spsem01/init.c
@@ -14,12 +14,16 @@
 /* configuration information */
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_TASKS 3
 #define CONFIGURE_MAXIMUM_SEMAPHORES 2
 #define CONFIGURE_INIT
 #include <rtems/confdefs.h>
 
+const char rtems_test_name[] = "SPSEM 1";
+
 rtems_task Task01(rtems_task_argument ignored);
 rtems_task Task02(rtems_task_argument ignored);
 rtems_task Init(rtems_task_argument ignored);
@@ -45,7 +49,7 @@ rtems_task Init(rtems_task_argument ignored)
   rtems_status_code status;
   rtems_attribute sem_attr;
 
-  printf("\n*** TEST SEM01 ***\n");
+  TEST_BEGIN();
 
   sem_attr = RTEMS_INHERIT_PRIORITY | RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY;
 
@@ -129,7 +133,7 @@ rtems_task Task01(rtems_task_argument ignored)
   printf("TA01: priority %d\n", getprio());
 
   printf("TA01: exiting\n");
-  printf("*** END OF SEM01 ***\n");
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/sptests/spsem02/init.c b/testsuites/sptests/spsem02/init.c
index 5d5b09c..c88e9ad 100644
--- a/testsuites/sptests/spsem02/init.c
+++ b/testsuites/sptests/spsem02/init.c
@@ -14,12 +14,16 @@
 /* configuration information */
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_TASKS 4
 #define CONFIGURE_MAXIMUM_SEMAPHORES 2
 #define CONFIGURE_INIT
 #include <rtems/confdefs.h>
 
+const char rtems_test_name[] = "SPSEM 2";
+
 rtems_task Task01(rtems_task_argument ignored);
 rtems_task Task02(rtems_task_argument ignored);
 rtems_task Task03(rtems_task_argument ignored);
@@ -46,7 +50,7 @@ rtems_task Init(rtems_task_argument ignored)
   rtems_status_code status;
   rtems_attribute sem_attr;
 
-  printf("\n*** TEST SEM02 ***\n");
+  TEST_BEGIN();
 
   sem_attr = RTEMS_INHERIT_PRIORITY | RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY;
 
@@ -147,7 +151,7 @@ rtems_task Task01(rtems_task_argument ignored)
   printf("TA01: priority %d\n", getprio());
 
   printf("TA01: exiting\n");
-  printf("*** END OF SEM02 ***\n");
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/sptests/spsimplesched01/init.c b/testsuites/sptests/spsimplesched01/init.c
index df1f6c7..6bac9c3 100644
--- a/testsuites/sptests/spsimplesched01/init.c
+++ b/testsuites/sptests/spsimplesched01/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SPSIMPLESCHED 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Test_task(rtems_task_argument unused);
@@ -40,7 +42,7 @@ rtems_task Test_task(
     status = rtems_clock_get_tod( &time );
     directive_failed( status, "clock get tod" );
     if ( time.second >= 35 ) {
-      puts( "*** END OF SIMPLE01 TEST ***" );
+      TEST_END();
       rtems_test_exit( 0 );
     }
     put_name( Task_name[ task_index ], FALSE );
@@ -60,7 +62,7 @@ rtems_task Init(
   rtems_time_of_day   time;
   rtems_task_priority old;
 
-  puts( "\n\n*** SIMPLE01 TEST ***" );
+  TEST_BEGIN();
 
   time.year   = 1988;
   time.month  = 12;
@@ -128,6 +130,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS             4
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (3 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spsimplesched02/init.c b/testsuites/sptests/spsimplesched02/init.c
index 7665ec9..2bf7b50 100644
--- a/testsuites/sptests/spsimplesched02/init.c
+++ b/testsuites/sptests/spsimplesched02/init.c
@@ -15,6 +15,8 @@
 
 #include <rtems/score/threadimpl.h>
 
+const char rtems_test_name[] = "SPSIMPLESCHED 2";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Test_task(rtems_task_argument argument);
@@ -76,7 +78,7 @@ rtems_task Init(
 {
   rtems_status_code   status;
 
-  puts( "\n\n*** SIMPLE SCHEDULER 02 TEST ***" );
+  TEST_BEGIN();
 
   status = _Objects_Name_to_id_u32(
     &_Thread_Internal_information,
@@ -134,7 +136,7 @@ rtems_task Init(
   ObtainRelease( true );
 
   /*  End the Test */
-  puts( "*** END OF SIMPLE SCHEDULER 02 TEST ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -147,6 +149,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS             3
 #define CONFIGURE_MAXIMUM_SEMAPHORES        2
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS         (3 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spsimplesched03/init.c b/testsuites/sptests/spsimplesched03/init.c
index 81831f9..2f352af 100644
--- a/testsuites/sptests/spsimplesched03/init.c
+++ b/testsuites/sptests/spsimplesched03/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SPSIMPLESCHED 3";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -22,7 +24,7 @@ rtems_task Init(
 {
   rtems_status_code   status;
 
-  puts( "\n\n*** SIMPLE SCHEDULER 03 TEST ***" );
+  TEST_BEGIN();
 
   puts( "INIT - rtems timer initiate server");
   status = rtems_timer_initiate_server( 
@@ -33,7 +35,7 @@ rtems_task Init(
   directive_failed( status, "Timer Initiate Server" );
 
   /*  End the Test */
-  puts( "*** END OF SIMPLE SCHEDULER 03 TEST ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -43,6 +45,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             2
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_INIT_TASK_PRIORITY        2
 
diff --git a/testsuites/sptests/spsize/init.c b/testsuites/sptests/spsize/init.c
index 8d8a281..c26ba06 100644
--- a/testsuites/sptests/spsize/init.c
+++ b/testsuites/sptests/spsize/init.c
@@ -26,6 +26,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "SPSIZE";
+
 /* #define HAVE_MENU */
 
 void size_rtems( int mode );
@@ -40,9 +42,9 @@ rtems_task Init(
 
   setvbuf(stdout, 0, _IONBF, 0);
 
-  puts( "\n*** RTEMS SIZE PROGRAM ***" );
+  TEST_BEGIN();
   size_rtems( 1 );
-  puts( "*** END OF RTEMS SIZE PROGRAM ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 #if defined(HAVE_MENU)
   do {
diff --git a/testsuites/sptests/spsize/system.h b/testsuites/sptests/spsize/system.h
index b722a55..ab4c458 100644
--- a/testsuites/sptests/spsize/system.h
+++ b/testsuites/sptests/spsize/system.h
@@ -31,6 +31,8 @@ int getint( void );
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS 1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #include <rtems/confdefs.h>
diff --git a/testsuites/sptests/spstkalloc/init.c b/testsuites/sptests/spstkalloc/init.c
index 5eef9be..4a26fdb 100644
--- a/testsuites/sptests/spstkalloc/init.c
+++ b/testsuites/sptests/spstkalloc/init.c
@@ -13,6 +13,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SPSTKALLOC";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -46,7 +48,7 @@ rtems_task Init(
   rtems_id          taskId;
   rtems_id          taskId1;
 
-  puts( "\n\n*** TEST OF STACK ALLOCATOR PLUGIN ***" );
+  TEST_BEGIN();
 
   puts( "Init - create task TA1 to use custom stack allocator - OK" );
   rc = rtems_task_create(
@@ -74,7 +76,7 @@ rtems_task Init(
   rc = rtems_task_delete( taskId );
   directive_failed( rc, "rtems_task_delete of TA1" );
 
-  puts( "*** END OF OF STACK ALLOCATOR PLUGIN TEST ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -86,6 +88,8 @@ rtems_task Init(
 #define CONFIGURE_TASK_STACK_ALLOCATOR    StackAllocator
 #define CONFIGURE_TASK_STACK_DEALLOCATOR  StackDeallocator
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_TASKS 3
 
diff --git a/testsuites/sptests/spstkalloc02/init.c b/testsuites/sptests/spstkalloc02/init.c
index 7191f32..7fb5fd2 100644
--- a/testsuites/sptests/spstkalloc02/init.c
+++ b/testsuites/sptests/spstkalloc02/init.c
@@ -26,6 +26,8 @@
 
 #include <tmacros.h>
 
+const char rtems_test_name[] = "SPSTKALLOC 2";
+
 #if !BSP_SMALL_MEMORY
 
 #include <stdio.h>
@@ -74,7 +76,7 @@ static rtems_task Init(rtems_task_argument argument)
   rtems_id id = RTEMS_ID_NONE;
   int i = 0;
 
-  puts("\n\n*** TEST STKALLOC 02 ***");
+  TEST_BEGIN();
 
   print_info();
 
@@ -112,7 +114,7 @@ static rtems_task Init(rtems_task_argument argument)
 
   print_info();
 
-  puts("*** END OF TEST STKALLOC 02 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -129,6 +131,8 @@ static rtems_task Init(rtems_task_argument argument)
 #define CONFIGURE_TASK_STACK_FROM_ALLOCATOR(stack_size) \
   ((stack_size) + HEAP_BLOCK_HEADER_SIZE + PAGE_SIZE - 1)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
@@ -165,7 +169,7 @@ static void task_stack_free(void *addr)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST STKALLOC 02 ***");
+  TEST_BEGIN();
   puts("NOT ENOUGH MEMORY TO RUN TEST");
 
   rtems_test_exit(0);
diff --git a/testsuites/sptests/spthreadq01/init.c b/testsuites/sptests/spthreadq01/init.c
index 63012e3..ffaf3e9 100644
--- a/testsuites/sptests/spthreadq01/init.c
+++ b/testsuites/sptests/spthreadq01/init.c
@@ -16,6 +16,8 @@
 #include <sys/types.h>
 #include <rtems/score/threadqimpl.h>
 
+const char rtems_test_name[] = "SPTHREADQ 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void threadq_first_empty(
@@ -46,12 +48,12 @@ rtems_task Init(
   rtems_task_argument ignored
 )
 {
-  puts( "\n\n*** TEST THREAD QUEUE TEST 01 ***" );
+  TEST_BEGIN();
 
   threadq_first_empty( "FIFO", THREAD_QUEUE_DISCIPLINE_FIFO );
   threadq_first_empty( "Priority", THREAD_QUEUE_DISCIPLINE_PRIORITY );
 
-  puts( "*** END OF TEST THREAD QUEUE TEST 01 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -61,6 +63,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS  1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sptimer_err01/init.c b/testsuites/sptests/sptimer_err01/init.c
index 6108ac7..dfc6e87 100644
--- a/testsuites/sptests/sptimer_err01/init.c
+++ b/testsuites/sptests/sptimer_err01/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "SPTIMER_ERR 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_timer_service_routine Delayed_routine(
@@ -25,7 +27,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST SPTIMER_ERR01 ***" );
+  TEST_BEGIN();
 
   rtems_status_code        status;
   rtems_time_of_day        time;
@@ -226,7 +228,7 @@ rtems_task Init(
   puts( "TA1 - rtems_timer_get_information - RTEMS_INVALID_ID" );
 
 
-  puts( "*** END OF TEST SPTIMER_ERR01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -245,6 +247,8 @@ rtems_timer_service_routine Delayed_routine(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_MAXIMUM_TIMERS              1
 
diff --git a/testsuites/sptests/sptimer_err02/init.c b/testsuites/sptests/sptimer_err02/init.c
index 0e64410..23fcf53 100644
--- a/testsuites/sptests/sptimer_err02/init.c
+++ b/testsuites/sptests/sptimer_err02/init.c
@@ -14,6 +14,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "SPTIMER_ERR 2";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_timer_service_routine Delayed_routine(
@@ -25,7 +27,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST SPTIMER_ERR02 ***" );
+  TEST_BEGIN();
 
   rtems_status_code        status;
   rtems_time_of_day        time;
@@ -197,7 +199,7 @@ rtems_task Init(
     " - before RTEMS_INVALID_CLOCK\n"
   );
 
-  puts( "*** END OF TEST SPTIMER_ERR02 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -221,6 +223,8 @@ rtems_timer_service_routine Delayed_routine(
 #define CONFIGURE_MAXIMUM_TIMERS          1
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/sptimespec01/init.c b/testsuites/sptests/sptimespec01/init.c
index 3c6ae2e..945bd21 100644
--- a/testsuites/sptests/sptimespec01/init.c
+++ b/testsuites/sptests/sptimespec01/init.c
@@ -15,6 +15,8 @@
 #include <rtems/timespec.h>
 #include <rtems/score/todimpl.h>
 
+const char rtems_test_name[] = "SPTIMESPEC 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void test_add(void);
@@ -40,7 +42,7 @@ rtems_task Init(
   timespec1=&ts1;
   timespec2=&ts2;
 
-  puts( "\n\n*** TEST sptimespec01 ***" );
+  TEST_BEGIN();
 
   test_add();
   test_divide();
@@ -50,7 +52,7 @@ rtems_task Init(
   test_subtract();
   test_convert();
 
-  puts( "\n*** END OF TEST sptimespec01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -242,6 +244,8 @@ void test_convert(){
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sptls01/init.c b/testsuites/sptests/sptls01/init.c
index d099d70..1f06aaa 100644
--- a/testsuites/sptests/sptls01/init.c
+++ b/testsuites/sptests/sptls01/init.c
@@ -20,6 +20,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPTLS 1";
+
 static rtems_id master_task;
 
 static __thread volatile char tls_item = 123;
@@ -84,11 +86,11 @@ static void test(void)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST SPTLS 1 ***");
+  TEST_BEGIN();
 
   test();
 
-  puts("*** END OF TEST SPTLS 1 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -98,6 +100,8 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MAXIMUM_TASKS 2
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/sptls02/init.cc b/testsuites/sptests/sptls02/init.cc
index 5902a77..b15e358 100644
--- a/testsuites/sptests/sptls02/init.cc
+++ b/testsuites/sptests/sptls02/init.cc
@@ -22,8 +22,11 @@
 #include <rtems.h>
 #include <rtems/libcsupport.h>
 
+#define TESTS_USE_PRINTF
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPTLS 2";
+
 static thread_local long i123 = 123;
 
 alignas(256) static thread_local long a256 = 256;
@@ -219,7 +222,7 @@ static void testTask()
 
 extern "C" void Init(rtems_task_argument arg)
 {
-	puts("\n\n*** TEST SPTLS 2 ***");
+	TEST_BEGIN();
 
 	printf("A::globalCounter() = %li\n", A::globalCounter());
 
@@ -238,7 +241,7 @@ extern "C" void Init(rtems_task_argument arg)
 
 	rtems_test_assert(rtems_resource_snapshot_check(&snapshot));
 
-	puts("*** END OF TEST SPTLS 2 ***");
+	TEST_END();
 
 	exit(0);
 }
@@ -249,6 +252,8 @@ extern "C" void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TASKS 2
 #define CONFIGURE_MAXIMUM_SEMAPHORES 3
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MAXIMUM_POSIX_KEYS 2
diff --git a/testsuites/sptests/sptls03/init.c b/testsuites/sptests/sptls03/init.c
index 268263d..7974264 100644
--- a/testsuites/sptests/sptls03/init.c
+++ b/testsuites/sptests/sptls03/init.c
@@ -20,6 +20,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "SPTLS 3";
+
 static volatile int read_write_small = 0xdeadbeef;
 
 static const volatile int read_only_small = 0x601dc0fe;
@@ -36,11 +38,11 @@ static void test(void)
 
 static void Init(rtems_task_argument arg)
 {
-  puts("\n\n*** TEST SPTLS 3 ***");
+  TEST_BEGIN();
 
   test();
 
-  puts("*** END OF TEST SPTLS 3 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -50,6 +52,8 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/sptests/spwatchdog/init.c b/testsuites/sptests/spwatchdog/init.c
index 2e952b6..c104aec 100644
--- a/testsuites/sptests/spwatchdog/init.c
+++ b/testsuites/sptests/spwatchdog/init.c
@@ -24,6 +24,8 @@
 
 #include <rtems/score/watchdogimpl.h>
 
+const char rtems_test_name[] = "SPWATCHDOG";
+
 static void test_watchdog_routine( Objects_Id id, void *arg )
 {
   (void) id;
@@ -53,7 +55,7 @@ rtems_task Init(
   rtems_status_code  status;
   Chain_Control      empty;
 
-   puts( "\n*** RTEMS WATCHDOG ***" );
+  TEST_BEGIN();
 
   puts( "INIT - report on empty watchdog chain" );
 
diff --git a/testsuites/sptests/spwatchdog/system.h b/testsuites/sptests/spwatchdog/system.h
index b2f1256..887c8c8 100644
--- a/testsuites/sptests/spwatchdog/system.h
+++ b/testsuites/sptests/spwatchdog/system.h
@@ -39,6 +39,8 @@ rtems_task Task_1(
 #define CONFIGURE_MAXIMUM_TIMERS          2
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/sptests/spwatchdog/task1.c b/testsuites/sptests/spwatchdog/task1.c
index 708cc7b..f17ae9d 100644
--- a/testsuites/sptests/spwatchdog/task1.c
+++ b/testsuites/sptests/spwatchdog/task1.c
@@ -93,6 +93,6 @@ rtems_task Task_1(
   status = rtems_timer_delete( tmid );
   directive_failed( status, "rtems_timer_delete" );
 
-  puts( "*** END OF RTEMS WATCHDOG PROGRAM ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/sptests/spwkspace/init.c b/testsuites/sptests/spwkspace/init.c
index 05a5069..5131ebc 100644
--- a/testsuites/sptests/spwkspace/init.c
+++ b/testsuites/sptests/spwkspace/init.c
@@ -19,6 +19,8 @@
 
 #include <rtems/score/wkspace.h>
 
+const char rtems_test_name[] = "SPWKSPACE";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -73,7 +75,7 @@ rtems_task Init(
   bool                    retbool;
   Heap_Information_block  info;
 
-  puts( "\n\n*** TEST WORKSPACE CLASSIC API ***" );
+  TEST_BEGIN();
 
   puts( "rtems_workspace_get_information - null pointer" );
   retbool = rtems_workspace_get_information( NULL );
@@ -114,7 +116,7 @@ rtems_task Init(
   puts( "_Workspace_Allocate_aligned" );
   test_workspace_allocate_aligned();
 
-  puts( "*** END OF TEST WORKSPACE CLASSIC API ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -123,6 +125,8 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_MAXIMUM_TASKS             1




More information about the vc mailing list