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

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


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

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

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

---

 testsuites/psxtests/psx01/init.c              |    4 +++-
 testsuites/psxtests/psx01/system.h            |    2 ++
 testsuites/psxtests/psx01/task.c              |    2 +-
 testsuites/psxtests/psx02/init.c              |    6 ++++--
 testsuites/psxtests/psx02/system.h            |    2 ++
 testsuites/psxtests/psx02/task.c              |    2 +-
 testsuites/psxtests/psx03/init.c              |    6 ++++--
 testsuites/psxtests/psx03/system.h            |    2 ++
 testsuites/psxtests/psx04/init.c              |    6 ++++--
 testsuites/psxtests/psx04/system.h            |    2 ++
 testsuites/psxtests/psx05/init.c              |    6 ++++--
 testsuites/psxtests/psx05/system.h            |    2 ++
 testsuites/psxtests/psx06/init.c              |    6 ++++--
 testsuites/psxtests/psx06/system.h            |    2 ++
 testsuites/psxtests/psx07/init.c              |    6 ++++--
 testsuites/psxtests/psx07/system.h            |    2 ++
 testsuites/psxtests/psx08/init.c              |    4 +++-
 testsuites/psxtests/psx08/system.h            |    2 ++
 testsuites/psxtests/psx08/task3.c             |    2 +-
 testsuites/psxtests/psx09/init.c              |    6 ++++--
 testsuites/psxtests/psx09/system.h            |    2 ++
 testsuites/psxtests/psx10/init.c              |    5 +++--
 testsuites/psxtests/psx10/system.h            |    2 ++
 testsuites/psxtests/psx11/init.c              |    6 ++++--
 testsuites/psxtests/psx11/system.h            |    2 ++
 testsuites/psxtests/psx12/init.c              |    6 ++++--
 testsuites/psxtests/psx12/system.h            |    2 ++
 testsuites/psxtests/psx13/main.c              |    2 ++
 testsuites/psxtests/psx13/test.c              |    8 +++++---
 testsuites/psxtests/psx14/init.c              |    6 ++++--
 testsuites/psxtests/psx14/system.h            |    2 ++
 testsuites/psxtests/psx15/init.c              |   12 ++++++++----
 testsuites/psxtests/psx16/init.c              |    8 ++++++--
 testsuites/psxtests/psxaio01/init.c           |    6 ++++--
 testsuites/psxtests/psxaio01/system.h         |    2 ++
 testsuites/psxtests/psxaio02/init.c           |    6 ++++--
 testsuites/psxtests/psxaio02/system.h         |    2 ++
 testsuites/psxtests/psxaio03/init.c           |    6 ++++--
 testsuites/psxtests/psxaio03/system.h         |    2 ++
 testsuites/psxtests/psxalarm01/init.c         |    8 ++++++--
 testsuites/psxtests/psxautoinit01/init.c      |    8 ++++++--
 testsuites/psxtests/psxautoinit02/init.c      |    8 ++++++--
 testsuites/psxtests/psxbarrier01/main.c       |    5 +++++
 testsuites/psxtests/psxbarrier01/test.c       |    6 ++++--
 testsuites/psxtests/psxcancel/init.c          |    8 ++++++--
 testsuites/psxtests/psxcancel01/init.c        |    8 ++++++--
 testsuites/psxtests/psxchroot01/main.c        |    2 ++
 testsuites/psxtests/psxchroot01/test.c        |    6 ++++--
 testsuites/psxtests/psxclassic01/init.c       |    8 ++++++--
 testsuites/psxtests/psxcleanup/psxcleanup.c   |    6 ++++--
 testsuites/psxtests/psxcleanup/system.h       |    2 ++
 testsuites/psxtests/psxcleanup01/init.c       |    8 ++++++--
 testsuites/psxtests/psxclock/init.c           |    8 ++++++--
 testsuites/psxtests/psxcond01/init.c          |    8 ++++++--
 testsuites/psxtests/psxconfig01/init.c        |   11 +++++++++--
 testsuites/psxtests/psxeintr_join/init.c      |    8 ++++++--
 testsuites/psxtests/psxenosys/init.c          |    6 ++++--
 testsuites/psxtests/psxenosys/system.h        |    2 ++
 testsuites/psxtests/psxfatal_support/init.c   |    6 ++++--
 testsuites/psxtests/psxfatal_support/system.h |    4 +++-
 testsuites/psxtests/psxfchx01/init.c          |    8 ++++++--
 testsuites/psxtests/psxfile01/main.c          |    2 ++
 testsuites/psxtests/psxfile01/test.c          |    6 ++++--
 testsuites/psxtests/psxfile02/init.c          |    8 ++++++--
 testsuites/psxtests/psxfilelock01/init.c      |    8 ++++++--
 testsuites/psxtests/psxgetattrnp01/init.c     |   10 ++++++----
 testsuites/psxtests/psxgetrusage01/init.c     |    8 ++++++--
 testsuites/psxtests/psxid01/init.c            |    8 ++++++--
 testsuites/psxtests/psximfs01/init.c          |    8 ++++++--
 testsuites/psxtests/psximfs02/init.c          |    8 ++++++--
 testsuites/psxtests/psxintrcritical01/init.c  |    8 ++++++--
 testsuites/psxtests/psxitimer/init.c          |    8 ++++++--
 testsuites/psxtests/psxkey01/init.c           |    6 ++++--
 testsuites/psxtests/psxkey01/system.h         |    2 ++
 testsuites/psxtests/psxkey02/init.c           |    8 ++++++--
 testsuites/psxtests/psxkey03/init.c           |    8 ++++++--
 testsuites/psxtests/psxkey04/init.c           |    8 ++++++--
 testsuites/psxtests/psxkey05/init.c           |    8 ++++++--
 testsuites/psxtests/psxkey06/init.c           |    8 ++++++--
 testsuites/psxtests/psxkey07/init.c           |    8 ++++++--
 testsuites/psxtests/psxkey08/init.c           |    8 ++++++--
 testsuites/psxtests/psxkey09/init.c           |    7 +++++--
 testsuites/psxtests/psxkey10/init.c           |    8 ++++++--
 testsuites/psxtests/psxmount/main.c           |    2 ++
 testsuites/psxtests/psxmount/test.c           |    6 ++++--
 testsuites/psxtests/psxmsgq01/init.c          |    6 ++++--
 testsuites/psxtests/psxmsgq01/system.h        |    2 ++
 testsuites/psxtests/psxmsgq02/init.c          |    6 ++++--
 testsuites/psxtests/psxmsgq02/system.h        |    2 ++
 testsuites/psxtests/psxmsgq03/init.c          |    6 ++++--
 testsuites/psxtests/psxmsgq03/system.h        |    2 ++
 testsuites/psxtests/psxmsgq04/init.c          |    8 ++++++--
 testsuites/psxtests/psxmutexattr01/init.c     |    8 ++++++--
 testsuites/psxtests/psxobj01/init.c           |    8 ++++++--
 testsuites/psxtests/psxonce01/init.c          |    6 ++++--
 testsuites/psxtests/psxpasswd01/init.c        |    8 ++++++--
 testsuites/psxtests/psxpasswd02/init.c        |    8 ++++++--
 testsuites/psxtests/psxpipe01/init.c          |    8 ++++++--
 testsuites/psxtests/psxrdwrv/main.c           |    2 ++
 testsuites/psxtests/psxrdwrv/test.c           |    6 ++++--
 testsuites/psxtests/psxreaddir/main.c         |    2 ++
 testsuites/psxtests/psxreaddir/test.c         |    6 ++++--
 testsuites/psxtests/psxrwlock01/main.c        |    5 +++++
 testsuites/psxtests/psxrwlock01/test.c        |    6 ++++--
 testsuites/psxtests/psxsem01/init.c           |    8 ++++++--
 testsuites/psxtests/psxsignal01/init.c        |    6 ++++--
 testsuites/psxtests/psxsignal01/system.h      |    2 ++
 testsuites/psxtests/psxsignal02/init.c        |    8 ++++++--
 testsuites/psxtests/psxsignal03/init.c        |   16 ++++++++++------
 testsuites/psxtests/psxsignal05/init.c        |   10 +++++++---
 testsuites/psxtests/psxsignal06/init.c        |    8 ++++++--
 testsuites/psxtests/psxspin01/main.c          |    2 ++
 testsuites/psxtests/psxspin01/test.c          |    6 ++++--
 testsuites/psxtests/psxspin02/main.c          |    2 ++
 testsuites/psxtests/psxspin02/test.c          |    6 ++++--
 testsuites/psxtests/psxstack01/init.c         |    8 ++++++--
 testsuites/psxtests/psxstack02/init.c         |    8 ++++++--
 testsuites/psxtests/psxstat/main.c            |    2 ++
 testsuites/psxtests/psxstat/test.c            |    8 ++++----
 testsuites/psxtests/psxsysconf/init.c         |    6 ++++--
 testsuites/psxtests/psxsysconf/system.h       |    2 ++
 testsuites/psxtests/psxtime/main.c            |    2 ++
 testsuites/psxtests/psxtime/test.c            |    6 ++++--
 testsuites/psxtests/psxtimer01/psxtimer.c     |    6 ++++--
 testsuites/psxtests/psxtimer01/system.h       |    2 ++
 testsuites/psxtests/psxtimer02/psxtimer.c     |    6 ++++--
 testsuites/psxtests/psxtimer02/system.h       |    2 ++
 testsuites/psxtests/psxtimes01/init.c         |    8 ++++++--
 testsuites/psxtests/psxualarm/init.c          |    6 ++++--
 testsuites/psxtests/psxualarm/system.h        |    2 ++
 testsuites/psxtests/psxusleep/init.c          |    8 ++++++--
 131 files changed, 543 insertions(+), 190 deletions(-)

diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c
index a97f797..2b2fafd 100644
--- a/testsuites/psxtests/psx01/init.c
+++ b/testsuites/psxtests/psx01/init.c
@@ -20,6 +20,8 @@
 
 #include <rtems/score/todimpl.h>
 
+const char rtems_test_name[] = "PSX 1";
+
 void *POSIX_Init(
   void *argument
 )
@@ -30,7 +32,7 @@ void *POSIX_Init(
   pthread_t       thread_id;
   struct utsname  uts;
 
-  puts( "\n\n*** POSIX TEST 1 ***" );
+  TEST_BEGIN();
 
   /* print some system information */
 
diff --git a/testsuites/psxtests/psx01/system.h b/testsuites/psxtests/psx01/system.h
index a6414fc..2addbb4 100644
--- a/testsuites/psxtests/psx01/system.h
+++ b/testsuites/psxtests/psx01/system.h
@@ -31,6 +31,8 @@ void *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_MAXIMUM_POSIX_THREADS     2
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psx01/task.c b/testsuites/psxtests/psx01/task.c
index f18ed2f..3aa88fe 100644
--- a/testsuites/psxtests/psx01/task.c
+++ b/testsuites/psxtests/psx01/task.c
@@ -71,7 +71,7 @@ void *Task_1_through_3(
   status = pthread_equal( Init_id, (pthread_t) -1 );
   rtems_test_assert( !status );
 
-  puts( "*** END OF POSIX TEST 1 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx02/init.c b/testsuites/psxtests/psx02/init.c
index ca4d41b..0d2ab06 100644
--- a/testsuites/psxtests/psx02/init.c
+++ b/testsuites/psxtests/psx02/init.c
@@ -15,6 +15,8 @@
 #include "system.h"
 #include <signal.h>
 
+const char rtems_test_name[] = "PSX 2";
+
 volatile int Signal_occurred;
 volatile int Signal_count;
 void Signal_handler( int signo );
@@ -44,7 +46,7 @@ void *POSIX_Init(
   sigset_t          mask;
   sigset_t          pending_set;
 
-  puts( "\n\n*** POSIX TEST 2 ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -141,7 +143,7 @@ void *POSIX_Init(
 
   /* exit this thread */
 
-  puts( "*** END OF POSIX TEST 2 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx02/system.h b/testsuites/psxtests/psx02/system.h
index 7830558..cf0242d 100644
--- a/testsuites/psxtests/psx02/system.h
+++ b/testsuites/psxtests/psx02/system.h
@@ -29,6 +29,8 @@ void *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_MAXIMUM_POSIX_THREADS     2
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psx02/task.c b/testsuites/psxtests/psx02/task.c
index 1170cc8..e62c338 100644
--- a/testsuites/psxtests/psx02/task.c
+++ b/testsuites/psxtests/psx02/task.c
@@ -39,7 +39,7 @@ void *Task_1_through_3(
     seconds = sleep( 1 );
     rtems_test_assert( !seconds );
   }
-  puts( "*** END OF POSIX TEST 2 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx03/init.c b/testsuites/psxtests/psx03/init.c
index d5b4ac6..5c5383c 100644
--- a/testsuites/psxtests/psx03/init.c
+++ b/testsuites/psxtests/psx03/init.c
@@ -16,6 +16,8 @@
 #include <signal.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSX 3";
+
 volatile int Signal_occurred;
 volatile int Signal_count;
 void Signal_handler( int signo );
@@ -46,7 +48,7 @@ void *POSIX_Init(
   int               signo;
   siginfo_t         siginfo;
 
-  puts( "\n\n*** POSIX TEST 3 ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -199,7 +201,7 @@ void *POSIX_Init(
 
   /* exit this thread */
 
-  puts( "*** END OF POSIX TEST 3 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx03/system.h b/testsuites/psxtests/psx03/system.h
index a192982..1fb6483 100644
--- a/testsuites/psxtests/psx03/system.h
+++ b/testsuites/psxtests/psx03/system.h
@@ -32,6 +32,8 @@ void *Task_2(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS     3
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psx04/init.c b/testsuites/psxtests/psx04/init.c
index d926037..ff3bb96 100644
--- a/testsuites/psxtests/psx04/init.c
+++ b/testsuites/psxtests/psx04/init.c
@@ -16,6 +16,8 @@
 #include <signal.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSX 4";
+
 volatile int Signal_occurred;
 volatile int Signal_count;
 void Signal_handler( int signo );
@@ -71,7 +73,7 @@ void *POSIX_Init(
   struct timespec   timeout;
   siginfo_t         info;
 
-  puts( "\n\n*** POSIX TEST 4 ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -579,7 +581,7 @@ void *POSIX_Init(
 
   /* exit this thread */
 
-  puts( "*** END OF POSIX TEST 4 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx04/system.h b/testsuites/psxtests/psx04/system.h
index af1331c..ebd6160 100644
--- a/testsuites/psxtests/psx04/system.h
+++ b/testsuites/psxtests/psx04/system.h
@@ -36,6 +36,8 @@ void *Task_3(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        4
 #define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 5
 
diff --git a/testsuites/psxtests/psx05/init.c b/testsuites/psxtests/psx05/init.c
index 5880adf..34a1aec 100644
--- a/testsuites/psxtests/psx05/init.c
+++ b/testsuites/psxtests/psx05/init.c
@@ -19,6 +19,8 @@
 
 #include <rtems/score/todimpl.h>
 
+const char rtems_test_name[] = "PSX 5";
+
 #define MUTEX_BAD_ID 0xfffffffe
 
 void Print_mutexattr(
@@ -129,7 +131,7 @@ void *POSIX_Init(
   rtems_test_assert( MUTEX_BAD_ID != PTHREAD_MUTEX_INITIALIZER );
   Mutex_bad_id = MUTEX_BAD_ID;
 
-  puts( "\n\n*** POSIX TEST 5 ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -683,7 +685,7 @@ void *POSIX_Init(
     printf( "status recursive mutex :%d\n", status );
   rtems_test_assert( !status );
 
-  puts( "*** END OF POSIX TEST 5 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx05/system.h b/testsuites/psxtests/psx05/system.h
index 9e9834c..9ce25e0 100644
--- a/testsuites/psxtests/psx05/system.h
+++ b/testsuites/psxtests/psx05/system.h
@@ -36,6 +36,8 @@ void *Task_3(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS  4
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES  2
 
diff --git a/testsuites/psxtests/psx06/init.c b/testsuites/psxtests/psx06/init.c
index 20e5a60..e077a28 100644
--- a/testsuites/psxtests/psx06/init.c
+++ b/testsuites/psxtests/psx06/init.c
@@ -15,6 +15,8 @@
 #include "system.h"
 #include <errno.h>
 
+const char rtems_test_name[] = "PSX 6";
+
 extern void Key_destructor( void *key_data );
 
 void Key_destructor(
@@ -40,7 +42,7 @@ void *POSIX_Init(
   unsigned int      remaining;
   uint32_t   *key_data;
 
-  puts( "\n\n*** POSIX TEST 6 ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -117,7 +119,7 @@ void *POSIX_Init(
 
   printf( "Destructor invoked %d times\n", Destructor_invoked );
 
-  puts( "*** END OF POSIX TEST 6 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx06/system.h b/testsuites/psxtests/psx06/system.h
index 31e2581..dbb991d 100644
--- a/testsuites/psxtests/psx06/system.h
+++ b/testsuites/psxtests/psx06/system.h
@@ -32,6 +32,8 @@ void *Task_2(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS  3
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     1
 
diff --git a/testsuites/psxtests/psx07/init.c b/testsuites/psxtests/psx07/init.c
index 68de152..cece668 100644
--- a/testsuites/psxtests/psx07/init.c
+++ b/testsuites/psxtests/psx07/init.c
@@ -20,6 +20,8 @@
 #include "tmacros.h"
 #include "pritime.h"
 
+const char rtems_test_name[] = "PSX 7";
+
 void print_schedparam(
   char               *prefix,
   struct sched_param *schedparam
@@ -63,7 +65,7 @@ void *POSIX_Init(
   pthread_attr_t      attr;
   pthread_attr_t      destroyed_attr;
 
-  puts( "\n\n*** POSIX TEST 7 ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -639,7 +641,7 @@ void *POSIX_Init(
   status = pthread_join( Task2_id, NULL );
   posix_service_failed( status, " pthread_join");
 
-  puts( "*** END OF POSIX TEST 7 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx07/system.h b/testsuites/psxtests/psx07/system.h
index 1d14b50..4c2d6a4 100644
--- a/testsuites/psxtests/psx07/system.h
+++ b/testsuites/psxtests/psx07/system.h
@@ -33,6 +33,8 @@ void *Task_2(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS     3
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psx08/init.c b/testsuites/psxtests/psx08/init.c
index 1297d0f..781ac1e 100644
--- a/testsuites/psxtests/psx08/init.c
+++ b/testsuites/psxtests/psx08/init.c
@@ -15,6 +15,8 @@
 #include "system.h"
 #include <errno.h>
 
+const char rtems_test_name[] = "PSX 8";
+
 void *POSIX_Init(
   void *argument
 )
@@ -22,7 +24,7 @@ void *POSIX_Init(
   int    status;
   void  *return_pointer;
 
-  puts( "\n\n*** POSIX TEST 8 ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
diff --git a/testsuites/psxtests/psx08/system.h b/testsuites/psxtests/psx08/system.h
index 756ea49..1ae4483 100644
--- a/testsuites/psxtests/psx08/system.h
+++ b/testsuites/psxtests/psx08/system.h
@@ -36,6 +36,8 @@ void *Task_3(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS     4
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psx08/task3.c b/testsuites/psxtests/psx08/task3.c
index 8bfee0b..acbdb99 100644
--- a/testsuites/psxtests/psx08/task3.c
+++ b/testsuites/psxtests/psx08/task3.c
@@ -46,7 +46,7 @@ void *Task_3(
       &Task2_id
     );
 
-  puts( "*** END OF POSIX TEST 8 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx09/init.c b/testsuites/psxtests/psx09/init.c
index caefa8d..eace61a 100644
--- a/testsuites/psxtests/psx09/init.c
+++ b/testsuites/psxtests/psx09/init.c
@@ -18,6 +18,8 @@
 #include <errno.h>
 #include "pritime.h"
 
+const char rtems_test_name[] = "PSX 9";
+
 void print_schedparam(
   char               *prefix,
   struct sched_param *schedparam
@@ -61,7 +63,7 @@ void *POSIX_Init(
   time_t               start;
   time_t               now;
 
-  puts( "\n\n*** POSIX TEST 9 ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -225,7 +227,7 @@ void *POSIX_Init(
   sprintf( buffer, " - new priority = %d", priority );
   print_current_time( "Init: ", buffer );
 
-  puts( "*** END OF POSIX TEST 9 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx09/system.h b/testsuites/psxtests/psx09/system.h
index 5bfe9b8..1c71e7f 100644
--- a/testsuites/psxtests/psx09/system.h
+++ b/testsuites/psxtests/psx09/system.h
@@ -32,6 +32,8 @@ void *Task_2(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS   1
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     10
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES  10
diff --git a/testsuites/psxtests/psx10/init.c b/testsuites/psxtests/psx10/init.c
index daf1413..a37e14e 100644
--- a/testsuites/psxtests/psx10/init.c
+++ b/testsuites/psxtests/psx10/init.c
@@ -15,6 +15,7 @@
 #include "system.h"
 #include <sched.h>
 
+const char rtems_test_name[] = "PSX 10";
 
 void *POSIX_Init(
   void *argument
@@ -27,7 +28,7 @@ void *POSIX_Init(
   pthread_cond_t      cond;
   struct timespec     timeout;
 
-  puts( "\n\n*** POSIX TEST 10 ***" );
+  TEST_BEGIN();
 
   puts( "Init: pthread_condattr_init" );
   status = pthread_condattr_init( &attr );
@@ -311,7 +312,7 @@ void *POSIX_Init(
   puts( "Init: sleep - switch to Task_3" );
   sleep( 1 );
 
-  puts( "*** END OF POSIX TEST 10 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx10/system.h b/testsuites/psxtests/psx10/system.h
index bca5982..573a065 100644
--- a/testsuites/psxtests/psx10/system.h
+++ b/testsuites/psxtests/psx10/system.h
@@ -38,6 +38,8 @@ void *Task_3(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              4
 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  1
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES              2
diff --git a/testsuites/psxtests/psx11/init.c b/testsuites/psxtests/psx11/init.c
index 1da2c28..9adde6e 100644
--- a/testsuites/psxtests/psx11/init.c
+++ b/testsuites/psxtests/psx11/init.c
@@ -17,6 +17,8 @@
 #include "system.h"
 #include <errno.h>
 
+const char rtems_test_name[] = "PSX 11";
+
 void *POSIX_Init(
   void *argument
 )
@@ -29,7 +31,7 @@ void *POSIX_Init(
   int                  priority_3;
   int                  priority_4;
 
-  puts( "\n\n*** POSIX TEST 11 ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -126,7 +128,7 @@ void *POSIX_Init(
   status = pthread_join( Task_id, NULL );
   rtems_test_assert( !status );
 
-  puts( "*** END OF POSIX TEST 11 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx11/system.h b/testsuites/psxtests/psx11/system.h
index 7b53258..19a9b16 100644
--- a/testsuites/psxtests/psx11/system.h
+++ b/testsuites/psxtests/psx11/system.h
@@ -28,6 +28,8 @@ void *Task_1(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS     4
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psx12/init.c b/testsuites/psxtests/psx12/init.c
index 183e6ea..a27f3b0 100644
--- a/testsuites/psxtests/psx12/init.c
+++ b/testsuites/psxtests/psx12/init.c
@@ -18,6 +18,8 @@
 #include <errno.h>
 #include "pritime.h"
 
+const char rtems_test_name[] = "PSX 12";
+
 void print_schedparam(
   char               *prefix,
   struct sched_param *schedparam
@@ -51,7 +53,7 @@ void *POSIX_Init(
   pthread_attr_t      attr;
   struct sched_param  schedparam;
 
-  puts( "\n\n*** POSIX TEST 12 ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -143,7 +145,7 @@ void *POSIX_Init(
 
     /* switch to Task_1 */
 
-  puts( "*** END OF POSIX TEST 12 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psx12/system.h b/testsuites/psxtests/psx12/system.h
index 91770bf..9aa786e 100644
--- a/testsuites/psxtests/psx12/system.h
+++ b/testsuites/psxtests/psx12/system.h
@@ -28,6 +28,8 @@ void *Task_1(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS   2
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     10
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES  10
diff --git a/testsuites/psxtests/psx13/main.c b/testsuites/psxtests/psx13/main.c
index f03844e..395c31b 100644
--- a/testsuites/psxtests/psx13/main.c
+++ b/testsuites/psxtests/psx13/main.c
@@ -41,6 +41,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/psxtests/psx13/test.c b/testsuites/psxtests/psx13/test.c
index ec2bec4..c039bff 100644
--- a/testsuites/psxtests/psx13/test.c
+++ b/testsuites/psxtests/psx13/test.c
@@ -39,6 +39,8 @@
 
 #include <pmacros.h>
 
+const char rtems_test_name[] = "PSX 13";
+
 int InitFiles(void);
 int DeviceLSeekTest(void);
 int DupTest(void);
@@ -647,7 +649,7 @@ int main(
 )
 #endif
 {
-  puts( "*** POSIX TEST 13 ***" );
+  TEST_BEGIN();
 
   if (InitFiles() == TRUE) {
     printf ("\nFiles initialized successfully.\n");
@@ -716,8 +718,8 @@ int main(
     sync();
   }
   else
-    printf ("\n\nError opening files for write!!!!\n");
+    TEST_BEGIN();
 
-  printf( "\n\n*** END OF TEST PSX13 ***\n" );
+  TEST_END();
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtests/psx14/init.c b/testsuites/psxtests/psx14/init.c
index 8e968c7..070501f 100644
--- a/testsuites/psxtests/psx14/init.c
+++ b/testsuites/psxtests/psx14/init.c
@@ -17,6 +17,8 @@
 #include <rtems/score/objectimpl.h>
 #include "tmacros.h"
 
+const char rtems_test_name[] = "PSX 14";
+
 void *POSIX_Init(
   void *argument
 )
@@ -25,7 +27,7 @@ void *POSIX_Init(
   char              *ptr;
   rtems_status_code  status;
 
-  puts( "\n\n*** POSIX TEST 14 ***" );
+  TEST_BEGIN();
 
   ptr = rtems_object_get_name( pthread_self(), 128, name );
   printf( "rtems_object_get_name returned (%s) for init thread\n", ptr );
@@ -60,7 +62,7 @@ void *POSIX_Init(
   );
 
 
-  puts( "*** END OF POSIX TEST 14 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL;
diff --git a/testsuites/psxtests/psx14/system.h b/testsuites/psxtests/psx14/system.h
index a654b8e..4de2160 100644
--- a/testsuites/psxtests/psx14/system.h
+++ b/testsuites/psxtests/psx14/system.h
@@ -27,6 +27,8 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS     2
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psx15/init.c b/testsuites/psxtests/psx15/init.c
index 9c50067..cb0d932 100644
--- a/testsuites/psxtests/psx15/init.c
+++ b/testsuites/psxtests/psx15/init.c
@@ -23,6 +23,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "PSX 15";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -64,7 +66,7 @@ void Init(rtems_task_argument arg)
 {
   rtems_status_code sc = RTEMS_SUCCESSFUL;
 
-  puts("\n\n*** POSIX TEST 15 ***");
+  TEST_BEGIN();
 
   sc = rtems_task_create(
     rtems_build_name('T', 'S', 'K', '1'),
@@ -92,7 +94,7 @@ void Init(rtems_task_argument arg)
   sc = rtems_task_start(task_0, suicide_task, 0);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
-  puts("*** END OF POSIX TEST 15 ***");
+  TEST_END();
 
   rtems_test_exit(0);
   rtems_test_assert(false);
@@ -106,11 +108,13 @@ void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TASKS 3
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS \
+  { .thread_delete = thread_delete_hook }, \
+  RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_PREEMPT
 #define CONFIGURE_INIT_TASK_PRIORITY 4
 
-#define CONFIGURE_INITIAL_EXTENSIONS { .thread_delete = thread_delete_hook }
-
 #include <rtems/confdefs.h>
diff --git a/testsuites/psxtests/psx16/init.c b/testsuites/psxtests/psx16/init.c
index 4e4d54f..55f6526 100644
--- a/testsuites/psxtests/psx16/init.c
+++ b/testsuites/psxtests/psx16/init.c
@@ -15,6 +15,8 @@
 #include "test_support.h"
 #include <pthread.h>
 
+const char rtems_test_name[] = "PSX 16";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *TestThread(void *argument);
@@ -40,7 +42,7 @@ void *POSIX_Init(void *argument)
   pthread_attr_t  attr;
   void           *join_return;
 
-  puts( "\n\n*** POSIX TEST PSX16 ***" );
+  TEST_BEGIN();
 
   Index = 5;
 
@@ -63,7 +65,7 @@ void *POSIX_Init(void *argument)
   rtems_test_assert( *(int *)join_return == 7 );
   puts( "Successfully joined with TestThread" );
 
-  puts( "*** END OF POSIX TEST PSX16 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -73,6 +75,8 @@ void *POSIX_Init(void *argument)
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        2
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psxaio01/init.c b/testsuites/psxtests/psxaio01/init.c
index de78db4..283507f 100644
--- a/testsuites/psxtests/psxaio01/init.c
+++ b/testsuites/psxtests/psxaio01/init.c
@@ -22,6 +22,8 @@
 #include <sched.h>
 #include <fcntl.h>
 
+const char rtems_test_name[] = "PSXAIO 1";
+
 #define BUFSIZE 512
 #define WRONG_FD 404
 
@@ -67,7 +69,7 @@ POSIX_Init (void *argument)
   fd = open ("/tmp/aio_fildes", O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO);
   rtems_test_assert ( fd != -1);
 
-  puts ("\n\n*** POSIX AIO TEST 01 ***");
+  TEST_BEGIN();
 
   puts (" Init: EBADF TESTS ");
 
@@ -191,7 +193,7 @@ POSIX_Init (void *argument)
 
   free_aiocb (aiocbp);
 
-  puts ("*** END OF POSIX AIO TEST 01 ***");
+  TEST_END();
 
   close (fd);
   rtems_test_exit (0);
diff --git a/testsuites/psxtests/psxaio01/system.h b/testsuites/psxtests/psxaio01/system.h
index 48965ef..2bb81a6 100644
--- a/testsuites/psxtests/psxaio01/system.h
+++ b/testsuites/psxtests/psxaio01/system.h
@@ -26,6 +26,8 @@ void *POSIX_Init (void *argument);
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES    20
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        10
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES        10
 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES     10
diff --git a/testsuites/psxtests/psxaio02/init.c b/testsuites/psxtests/psxaio02/init.c
index 4961e0b..89c4234 100644
--- a/testsuites/psxtests/psxaio02/init.c
+++ b/testsuites/psxtests/psxaio02/init.c
@@ -23,6 +23,8 @@
 #include <fcntl.h>
 #include <rtems/chain.h>
 
+const char rtems_test_name[] = "PSXAIO 2";
+
 /* forward declarations to avoid warnings */
 struct aiocb *create_aiocb(int fd);
 void free_aiocb(struct aiocb *aiocbp);
@@ -73,7 +75,7 @@ POSIX_Init (void *argument)
   status = mkdir ("/tmp", S_IRWXU);
   rtems_test_assert (!status);
   
-  puts ("\n\n*** POSIX AIO TEST 02 ***");
+  TEST_BEGIN();
   
   puts ("Init: Open files");
 
@@ -171,7 +173,7 @@ POSIX_Init (void *argument)
   status = aio_cancel (fd[5], aiocbp[6]);
   rtems_test_assert (status == AIO_ALLDONE);
 
-  puts ("*** END OF POSIX AIO TEST 02 ***");
+  TEST_END();
 
   for (i = 0; i < MAX; i++)
     {
diff --git a/testsuites/psxtests/psxaio02/system.h b/testsuites/psxtests/psxaio02/system.h
index 1c26abe..7d6c752 100644
--- a/testsuites/psxtests/psxaio02/system.h
+++ b/testsuites/psxtests/psxaio02/system.h
@@ -26,6 +26,8 @@ void *POSIX_Init (void *argument);
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES    20
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        10
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES        10
 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES     10
diff --git a/testsuites/psxtests/psxaio03/init.c b/testsuites/psxtests/psxaio03/init.c
index b103c02..eed3d4e 100644
--- a/testsuites/psxtests/psxaio03/init.c
+++ b/testsuites/psxtests/psxaio03/init.c
@@ -24,6 +24,8 @@
 #include <fcntl.h>
 #include <rtems/chain.h>
 
+const char rtems_test_name[] = "PSXAIO 3";
+
 /* forward declarations to avoid warnings */
 struct aiocb *create_aiocb(int fd);
 void free_aiocb(struct aiocb *aiocbp);
@@ -74,7 +76,7 @@ POSIX_Init (void *argument)
   status = mkdir ("/tmp", S_IRWXU);
   rtems_test_assert (!status);
 
-  puts ("\n\n*** POSIX AIO TEST 03 ***");
+  TEST_BEGIN();
 
   puts (" Init: Open files ");
 
@@ -127,7 +129,7 @@ POSIX_Init (void *argument)
   puts (" Init: going to sleep again for 5 sec ");
   sleep (5);
   
-  puts ("*** END OF POSIX AIO TEST 03 ***");
+  TEST_END();
   
   for (i = 0; i < MAX; i++)
     {
diff --git a/testsuites/psxtests/psxaio03/system.h b/testsuites/psxtests/psxaio03/system.h
index 2b0da1f..92ae0aa 100644
--- a/testsuites/psxtests/psxaio03/system.h
+++ b/testsuites/psxtests/psxaio03/system.h
@@ -27,6 +27,8 @@ void *POSIX_Init (void *argument);
 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES    20
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        30
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES        30
 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES     30
diff --git a/testsuites/psxtests/psxalarm01/init.c b/testsuites/psxtests/psxalarm01/init.c
index 1eb3e43..b6bf1d7 100644
--- a/testsuites/psxtests/psxalarm01/init.c
+++ b/testsuites/psxtests/psxalarm01/init.c
@@ -16,6 +16,8 @@
 #include <signal.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXALARM 1";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -70,7 +72,7 @@ void *POSIX_Init(
   struct sigaction  act;
   sigset_t          mask;
 
-  puts( "\n\n*** POSIX ALARM TEST 01 ***" );
+  TEST_BEGIN();
 
   /* install a signal handler for SIGALRM and unblock it */
 
@@ -107,7 +109,7 @@ void *POSIX_Init(
   printf( "Init: %d seconds left on previous alarm\n", remaining );
   rtems_test_assert( remaining == 0 );
 
-  puts( "*** END OF POSIX ALARM TEST 01***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
@@ -116,6 +118,8 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        1
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psxautoinit01/init.c b/testsuites/psxtests/psxautoinit01/init.c
index f557dbf..fb70a1e 100644
--- a/testsuites/psxtests/psxautoinit01/init.c
+++ b/testsuites/psxtests/psxautoinit01/init.c
@@ -15,6 +15,8 @@
 #include <pthread.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXAUTOINIT 1";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -27,7 +29,7 @@ void *POSIX_Init(
   pthread_mutex_t mutex2;
   int             prioceiling;
 
-  puts( "\n\n*** POSIX TEST -- AUTOMATIC INITIALIZAITON 01 ***" );
+  TEST_BEGIN();
 
   /* path using mutex get with interrupts disabled */
   mutex1 = PTHREAD_MUTEX_INITIALIZER;
@@ -63,7 +65,7 @@ void *POSIX_Init(
   sc = pthread_mutex_destroy( &mutex1 );
   fatal_posix_service_status( sc, 0, "mutex destroy OK" );
 
-  puts( "*** END OF POSIX TEST AUTOMATIC INITIALIZATION 01 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
@@ -72,6 +74,8 @@ void *POSIX_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_MAXIMUM_POSIX_THREADS 1
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES 1
 
diff --git a/testsuites/psxtests/psxautoinit02/init.c b/testsuites/psxtests/psxautoinit02/init.c
index f67b18d..967b9b8 100644
--- a/testsuites/psxtests/psxautoinit02/init.c
+++ b/testsuites/psxtests/psxautoinit02/init.c
@@ -15,6 +15,8 @@
 #include <pthread.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXAUTOINIT 2";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -26,7 +28,7 @@ void *POSIX_Init(
   pthread_cond_t cond1;
   pthread_cond_t cond2;
 
-  puts( "\n\n*** POSIX TEST -- AUTOMATIC INITIALIZAITON 02 ***" );
+  TEST_BEGIN();
 
   cond1 = PTHREAD_COND_INITIALIZER;
   cond2 = PTHREAD_COND_INITIALIZER;
@@ -42,7 +44,7 @@ void *POSIX_Init(
   sc = pthread_cond_destroy( &cond1 );
   fatal_posix_service_status( sc, 0, "cond destroy OK" );
 
-  puts( "*** END OF POSIX TEST AUTOMATIC INITIALIZATION 02 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
@@ -51,6 +53,8 @@ void *POSIX_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_MAXIMUM_POSIX_THREADS 1
 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 1
 
diff --git a/testsuites/psxtests/psxbarrier01/main.c b/testsuites/psxtests/psxbarrier01/main.c
index f714892..6475016 100644
--- a/testsuites/psxtests/psxbarrier01/main.c
+++ b/testsuites/psxtests/psxbarrier01/main.c
@@ -13,6 +13,7 @@
 #include "config.h"
 #endif
 
+#include <rtems/test.h>
 #include <bsp.h>
 #include <pmacros.h>
 
@@ -35,10 +36,14 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS 1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 10
 
 #define CONFIGURE_MAXIMUM_POSIX_BARRIERS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 
diff --git a/testsuites/psxtests/psxbarrier01/test.c b/testsuites/psxtests/psxbarrier01/test.c
index 06a1df4..bcbb87a 100644
--- a/testsuites/psxtests/psxbarrier01/test.c
+++ b/testsuites/psxtests/psxbarrier01/test.c
@@ -22,6 +22,8 @@
 
 #include "tmacros.h"
 
+const char rtems_test_name[] = "PSXBARRIER 1";
+
 #define NUMBER_THREADS 2
 pthread_t ThreadIds[NUMBER_THREADS];
 pthread_barrier_t Barrier;
@@ -62,7 +64,7 @@ int main(
   int                   p;
   int                   i;
 
-  puts( "\n\n*** POSIX BARRIER TEST 01 ***" );
+  TEST_BEGIN();
 
   /*************** NULL POINTER CHECKS *****************/
   puts( "pthread_barrierattr_init( NULL ) -- EINVAL" );
@@ -235,6 +237,6 @@ int main(
   }
 
   /*************** END OF TEST *****************/
-  puts( "*** END OF POSIX BARRIER TEST 01 ***" );
+  TEST_END();
   exit(0);
 }
diff --git a/testsuites/psxtests/psxcancel/init.c b/testsuites/psxtests/psxcancel/init.c
index 7644edf..c8c96b5 100644
--- a/testsuites/psxtests/psxcancel/init.c
+++ b/testsuites/psxtests/psxcancel/init.c
@@ -22,6 +22,8 @@
   #include <pmacros.h>
 #endif
 
+const char rtems_test_name[] = "PSXCANCEL";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void countTask_cancel_handler(void *ignored);
@@ -80,7 +82,7 @@ void *countTaskAsync(void *ignored)
   int       sc;
   int       old;
 
-  puts( "\n\n*** POSIX CANCEL TEST ***" );
+  TEST_BEGIN();
 
   /* generate some error conditions */
   puts( "Init - pthread_setcancelstate - NULL oldstate - EINVAL" );
@@ -130,7 +132,7 @@ void *countTaskAsync(void *ignored)
   }
 
 
-  puts( "*** END OF POSIX CANCEL TEST ***" );
+  TEST_END();
 
   #if defined(__rtems__)
     rtems_test_exit(EXIT_SUCCESS);
@@ -146,6 +148,8 @@ void *countTaskAsync(void *ignored)
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 2
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
 
diff --git a/testsuites/psxtests/psxcancel01/init.c b/testsuites/psxtests/psxcancel01/init.c
index 7d86092..fce188e 100644
--- a/testsuites/psxtests/psxcancel01/init.c
+++ b/testsuites/psxtests/psxcancel01/init.c
@@ -14,6 +14,8 @@
 #include <pmacros.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXCANCEL 1";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 rtems_timer_service_routine Cancel_duringISR_TSR(
@@ -109,7 +111,7 @@ void *POSIX_Init(
 {
   rtems_status_code status;
 
-  puts( "\n\n*** POSIX TEST CANCEL 01 ***" );
+  TEST_BEGIN();
 
   status = rtems_timer_create(
     rtems_build_name( 'T', 'M', '1', ' ' ),
@@ -121,7 +123,7 @@ void *POSIX_Init(
   doit( SetState_duringISR_TSR, "pthread_setcancelstate" );
   doit( SetType_duringISR_TSR, "pthread_setcanceltype" );
 
-  puts( "*** END OF POSIX TEST CANCEL 01 ***" );
+  TEST_END();
   rtems_test_exit(0);
   return NULL; /* just so the compiler thinks we returned something */
 }
@@ -133,6 +135,8 @@ void *POSIX_Init(
 
 #define CONFIGURE_MAXIMUM_TIMERS        1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        1
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
 
diff --git a/testsuites/psxtests/psxchroot01/main.c b/testsuites/psxtests/psxchroot01/main.c
index 64bfa8d..0255724 100644
--- a/testsuites/psxtests/psxchroot01/main.c
+++ b/testsuites/psxtests/psxchroot01/main.c
@@ -34,6 +34,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/psxtests/psxchroot01/test.c b/testsuites/psxtests/psxchroot01/test.c
index e105dad..27656ef 100644
--- a/testsuites/psxtests/psxchroot01/test.c
+++ b/testsuites/psxtests/psxchroot01/test.c
@@ -26,6 +26,8 @@
 #include <pmacros.h>
 #include <rtems/libcsupport.h>
 
+const char rtems_test_name[] = "PSXCHROOT 1";
+
 /* forward declarations to avoid warnings */
 int test_main(void);
 
@@ -87,7 +89,7 @@ int main(
 #if !fileexists(/two/two.test) echo "SUCCESSFUL"
 */
 
-  printf( "\n\n*** CHROOT01 TEST ***\n" );
+  TEST_BEGIN();
 
   status = mkdir( "/one", 0777);
   rtems_test_assert( status == 0 );
@@ -139,6 +141,6 @@ int main(
   status = fileexists( "/two/two.test" );
   printf( "%s on /two/two.test\n", (!status) ? "SUCCESS" : "FAILURE" );
 
-  printf( "*** END OF CHROOT01 TEST ***\n" );
+  TEST_END();
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtests/psxclassic01/init.c b/testsuites/psxtests/psxclassic01/init.c
index ce8929c..3ffbd3c 100644
--- a/testsuites/psxtests/psxclassic01/init.c
+++ b/testsuites/psxtests/psxclassic01/init.c
@@ -25,6 +25,8 @@
 #include <unistd.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXCLASSIC 1";
+
 int       Caught_signo = -1;
 siginfo_t Caught_siginfo = { -1, -1, };
 
@@ -107,7 +109,7 @@ rtems_task Init(rtems_task_argument arg)
   int               status;
   void             *retval;
 
-  puts( "*** START OF CLASSIC API TEST OF POSIX 01 ***" );
+  TEST_BEGIN();
 
   sc = rtems_task_create(
     rtems_build_name('T','E','S','T'),
@@ -141,7 +143,7 @@ rtems_task Init(rtems_task_argument arg)
   status = pthread_kill( task_id, SIGUSR1 );
   rtems_test_assert( status == 0 );
 
-  puts( "*** END OF CLASSIC API TEST OF POSIX 01 ***" );
+  TEST_END();
   exit(0);
 }
 
@@ -155,6 +157,8 @@ rtems_task Init(rtems_task_argument arg)
   (RTEMS_PREEMPT | RTEMS_NO_TIMESLICE | RTEMS_ASR | RTEMS_INTERRUPT_LEVEL(0))
 
 #define CONFIGURE_INIT_TASK_PRIORITY 4
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_UNIFIED_WORK_AREAS
diff --git a/testsuites/psxtests/psxcleanup/psxcleanup.c b/testsuites/psxtests/psxcleanup/psxcleanup.c
index 2ab4e38..2af4aaf 100644
--- a/testsuites/psxtests/psxcleanup/psxcleanup.c
+++ b/testsuites/psxtests/psxcleanup/psxcleanup.c
@@ -23,6 +23,8 @@
 #include <stdio.h>    /* console facilities */
 #include "tmacros.h"
 
+const char rtems_test_name[] = "PSXCLEANUP";
+
 #define NUMBER_THREADS 2
 pthread_t ThreadIds[NUMBER_THREADS];
 
@@ -230,7 +232,7 @@ void *POSIX_Init(
   int            status;
   lock_t         l;
 
-  puts( "\n\n*** POSIX CLEANUP TEST ***" );
+  TEST_BEGIN();
 
   /*************** INITIALIZE  ***************/
   initialize_lock_t(&l);
@@ -251,7 +253,7 @@ void *POSIX_Init(
   sleep(1);
 
   /*************** END OF TEST *****************/
-  puts( "*** END OF POSIX CLEANUP TEST ***\n" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/psxtests/psxcleanup/system.h b/testsuites/psxtests/psxcleanup/system.h
index 3caa7ac..04818f8 100644
--- a/testsuites/psxtests/psxcleanup/system.h
+++ b/testsuites/psxtests/psxcleanup/system.h
@@ -39,6 +39,8 @@ void *task_c(
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS             4
 #define CONFIGURE_MAXIMUM_POSIX_TIMERS              4
 #define CONFIGURE_MAXIMUM_TIMERS                    4
diff --git a/testsuites/psxtests/psxcleanup01/init.c b/testsuites/psxtests/psxcleanup01/init.c
index 427bc7f..502f90b 100644
--- a/testsuites/psxtests/psxcleanup01/init.c
+++ b/testsuites/psxtests/psxcleanup01/init.c
@@ -15,6 +15,8 @@
 #include "pmacros.h"
 #include <pthread.h>  /* thread facilities */
 
+const char rtems_test_name[] = "PSXCLEANUP 1";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void cleaner(void *arg);
@@ -29,7 +31,7 @@ void *POSIX_Init(
   void *argument
 )
 {
-  puts( "\n\n*** POSIX CLEANUP TEST 01 ***" );
+  TEST_BEGIN();
 
   puts( "Init - pthread_cleanup_push - a routine we will not execute" );
   pthread_cleanup_push(cleaner, NULL);
@@ -37,7 +39,7 @@ void *POSIX_Init(
   puts( "Init - pthread_cleanup_pop - do not execute" );
   pthread_cleanup_pop(0);
 
-  puts( "*** END OF POSIX CLEANUP TEST 01 ***\n" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -49,6 +51,8 @@ void *POSIX_Init(
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 1
 
 #define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psxclock/init.c b/testsuites/psxtests/psxclock/init.c
index 58beda1..669f4bb 100644
--- a/testsuites/psxtests/psxclock/init.c
+++ b/testsuites/psxtests/psxclock/init.c
@@ -19,6 +19,8 @@
 
 #include <rtems/score/todimpl.h>
 
+const char rtems_test_name[] = "PSXCLOCK";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void check_enosys(int status);
@@ -44,7 +46,7 @@ rtems_task Init(
   struct tm       tm;
   struct timespec delay_request;
 
-  puts( "\n\n*** POSIX CLOCK TEST ***" );
+  TEST_BEGIN();
 
   tm_build_time( &tm, TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
 
@@ -253,7 +255,7 @@ rtems_task Init(
     }
   #endif
 
-  puts( "*** END OF POSIX CLOCK TEST ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -262,6 +264,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/psxtests/psxcond01/init.c b/testsuites/psxtests/psxcond01/init.c
index 9c49fe9..395443a 100644
--- a/testsuites/psxtests/psxcond01/init.c
+++ b/testsuites/psxtests/psxcond01/init.c
@@ -15,6 +15,8 @@
 #include <pthread.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXCOND 1";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *BlockingThread(void *argument);
@@ -56,7 +58,7 @@ void *POSIX_Init(
   int        sc;
   pthread_t  Thread;
 
-  puts( "\n\n*** POSIX TEST -- CONDITION VARIABLE 01 ***" );
+  TEST_BEGIN();
 
   puts( "Init - pthread_mutex_init - Mutex1 - OK" );
   sc = pthread_mutex_init( &Mutex1, NULL );
@@ -81,7 +83,7 @@ void *POSIX_Init(
   sc = pthread_cond_wait( &Condition, &Mutex2 );
   fatal_posix_service_status( sc, EINVAL, "cond_wait EINVAL" );
 
-  puts( "*** END OF POSIX TEST CONDITION VARIABLE 01 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
@@ -90,6 +92,8 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 2
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES 2
 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 1
diff --git a/testsuites/psxtests/psxconfig01/init.c b/testsuites/psxtests/psxconfig01/init.c
index 4f3981d..f3752a7 100644
--- a/testsuites/psxtests/psxconfig01/init.c
+++ b/testsuites/psxtests/psxconfig01/init.c
@@ -24,6 +24,7 @@
   #include "config.h"
 #endif
 
+#include <rtems/test.h>
 #include <tmacros.h>
 
 #include <sys/stat.h>
@@ -39,6 +40,8 @@
 
 #include <rtems/libcsupport.h>
 
+const char rtems_test_name[] = "PSXCONFIG 1";
+
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
 
 #define CONFIGURE_MAXIMUM_BARRIERS 2
@@ -61,6 +64,8 @@
 #define CONFIGURE_MAXIMUM_POSIX_RWLOCKS 31
 #define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES 41
 #define CONFIGURE_MAXIMUM_POSIX_SPINLOCKS 17
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 3
 #define CONFIGURE_MAXIMUM_POSIX_TIMERS 47
 
@@ -167,6 +172,8 @@
 
 #define CONFIGURE_MAXIMUM_DRIVERS 2
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
@@ -249,7 +256,7 @@ static rtems_task Init(rtems_task_argument argument)
   rtems_resource_snapshot snapshot;
   int i = 0;
 
-  puts("\n\n*** POSIX TEST CONFIG 01 ***");
+  TEST_BEGIN();
 
   memset(posix_name, 'P', sizeof(posix_name) - 1);
 
@@ -552,7 +559,7 @@ static rtems_task Init(rtems_task_argument argument)
   printf("object creation done\n");
   print_info();
 
-  puts("*** END OF POSIX TEST CONFIG 01 ***");
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtests/psxeintr_join/init.c b/testsuites/psxtests/psxeintr_join/init.c
index 797605d..7fe0da7 100644
--- a/testsuites/psxtests/psxeintr_join/init.c
+++ b/testsuites/psxtests/psxeintr_join/init.c
@@ -20,6 +20,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXEINTR_JOIN";
+
 #define SIG_SUSPEND SIGUSR1
 #define SIG_THR_RESTART SIGUSR2
 
@@ -85,7 +87,7 @@ void *POSIX_Init( void *arg )
   pthread_t        mainThread;
   int              status;
 
-  puts( "*** POSIX TEST PSXEINTR_JOIN ***" );
+  TEST_BEGIN();
   status = sem_init( &GC_suspend_ack_sem, 0, 0);
   rtems_test_assert( status == 0 );
 
@@ -114,7 +116,7 @@ void *POSIX_Init( void *arg )
   pthread_join( newThread, NULL );
   puts( "Back from pthread_join" );
 
-  puts( "*** END OF POSIX TEST PSXEINTR_JOIN ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL;
@@ -125,6 +127,8 @@ void *POSIX_Init( void *arg )
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 2
 #define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES 1
 
diff --git a/testsuites/psxtests/psxenosys/init.c b/testsuites/psxtests/psxenosys/init.c
index afea3f3..6ae7c1d 100644
--- a/testsuites/psxtests/psxenosys/init.c
+++ b/testsuites/psxtests/psxenosys/init.c
@@ -28,6 +28,8 @@
 #include <unistd.h>
 #include <sched.h>
 
+const char rtems_test_name[] = "PSXENOSYS";
+
 #if !HAVE_DECL_MPROTECT
 extern int mprotect(const void *addr, size_t len, int prot);
 #endif
@@ -51,7 +53,7 @@ void *POSIX_Init(
 {
   int             sc;
 
-  puts( "\n\n*** POSIX TEST -- ENOSYS ***" );
+  TEST_BEGIN();
 
   puts( "lio_listio -- ENOSYS" );
   sc = lio_listio( 0, NULL, 0, NULL );
@@ -144,7 +146,7 @@ void *POSIX_Init(
     rtems_test_exit( 0 );
   }
 
-  puts( "*** END OF POSIX TEST ENOSYS ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psxenosys/system.h b/testsuites/psxtests/psxenosys/system.h
index fef8cd4..ef42e03 100644
--- a/testsuites/psxtests/psxenosys/system.h
+++ b/testsuites/psxtests/psxenosys/system.h
@@ -26,6 +26,8 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS     2
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psxfatal_support/init.c b/testsuites/psxtests/psxfatal_support/init.c
index 000f883..edbba48 100644
--- a/testsuites/psxtests/psxfatal_support/init.c
+++ b/testsuites/psxtests/psxfatal_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 POSIX FATAL " FATAL_ERROR_TEST_NAME " ***\n" );
+    rtems_test_begink();
   }
 }
 
@@ -93,7 +95,7 @@ void Fatal_extension(
       && is_internal == FATAL_ERROR_EXPECTED_IS_INTERNAL
       && error == FATAL_ERROR_EXPECTED_ERROR
   ) {
-    printk( "*** END OF TEST POSIX FATAL " FATAL_ERROR_TEST_NAME " ***\n" );
+    rtems_test_endk();
   }
 }
 
diff --git a/testsuites/psxtests/psxfatal_support/system.h b/testsuites/psxtests/psxfatal_support/system.h
index c276bc6..4a6e5d9 100644
--- a/testsuites/psxtests/psxfatal_support/system.h
+++ b/testsuites/psxtests/psxfatal_support/system.h
@@ -58,7 +58,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
@@ -68,6 +69,7 @@ extern rtems_extensions_table initial_extensions;
 #ifndef SPFATAL_TEST_CASE_EXTRA_THREADS
 #define SPFATAL_TEST_CASE_EXTRA_THREADS 0
 #endif
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS \
   (SPFATAL_TEST_CASE_EXTRA_THREADS + 1)
 
diff --git a/testsuites/psxtests/psxfchx01/init.c b/testsuites/psxtests/psxfchx01/init.c
index 4835be2..a6716b8 100644
--- a/testsuites/psxtests/psxfchx01/init.c
+++ b/testsuites/psxtests/psxfchx01/init.c
@@ -19,6 +19,8 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
+const char rtems_test_name[] = "PSXFCHX 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument ignored);
 
@@ -29,7 +31,7 @@ rtems_task Init(
   int status = 0;
   int fd = 0;
 
-  puts( "*** TEST Posix file op tests - 01 ***" );
+  TEST_BEGIN();
 
   /****************************************************
    *                   fchdir tests
@@ -209,7 +211,7 @@ rtems_task Init(
 
   puts( "End of fchown tests" );
 
-  puts( "*** END OF TEST Posix file op tests - 01 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -222,6 +224,8 @@ rtems_task Init(
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 
 #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/psxtests/psxfile01/main.c b/testsuites/psxtests/psxfile01/main.c
index 0f164e2..4972cc2 100644
--- a/testsuites/psxtests/psxfile01/main.c
+++ b/testsuites/psxtests/psxfile01/main.c
@@ -39,6 +39,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS 1
 #define CONFIGURE_INIT_TASK_STACK_SIZE (2 * RTEMS_MINIMUM_STACK_SIZE)
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psxfile01/test.c b/testsuites/psxtests/psxfile01/test.c
index 715a2cc..94f80c8 100644
--- a/testsuites/psxtests/psxfile01/test.c
+++ b/testsuites/psxtests/psxfile01/test.c
@@ -45,6 +45,8 @@
 
 #include "primode.h"
 
+const char rtems_test_name[] = "PSXFILE 1";
+
 /* forward declarations to avoid warnings */
 void test_case_reopen_append(void);
 void dump_statbuf(struct stat *buf);
@@ -158,7 +160,7 @@ int main(
   rtems_status_code rtems_status;
   rtems_time_of_day time;
 
-  printf( "\n\n*** FILE TEST 1 ***\n" );
+  TEST_BEGIN();
 
   /*
    *  Grab the maximum size of an in-memory file.
@@ -655,7 +657,7 @@ since new path is not valid");
 
   test_case_reopen_append();
 
-  printf( "*** END OF FILE TEST 1 ***\n" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/psxtests/psxfile02/init.c b/testsuites/psxtests/psxfile02/init.c
index fb19f81..d06a745 100644
--- a/testsuites/psxtests/psxfile02/init.c
+++ b/testsuites/psxtests/psxfile02/init.c
@@ -29,6 +29,8 @@
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXFILE 2";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void do_with_fd(int fd, const char *description);
@@ -111,7 +113,7 @@ rtems_task Init(
   int   status;
   int   fd;
 
-  puts( "\n\n*** PSXFILE02 TEST  ***" );
+  TEST_BEGIN();
 
   /*
    *  Simple open case where the file is created.
@@ -133,7 +135,7 @@ rtems_task Init(
   puts("");
   do_with_fd( 1000, "a too large file descriptor" );
 
-  puts( "*** END OF PSXFILE02 TEST  ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -145,6 +147,8 @@ rtems_task Init(
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 #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/psxtests/psxfilelock01/init.c b/testsuites/psxtests/psxfilelock01/init.c
index 5b3b0f6..d64d1a1 100644
--- a/testsuites/psxtests/psxfilelock01/init.c
+++ b/testsuites/psxtests/psxfilelock01/init.c
@@ -15,6 +15,8 @@
 #include "test_support.h"
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXFILELOCK 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -25,7 +27,7 @@ rtems_task Init(
   FILE *fd;
   int   sc;
 
-  puts( "\n\n*** TEST FILE LOCK 01 ***" );
+  TEST_BEGIN();
 
   puts( "Open /testfile" );
   fd = fopen( "/testfile", "w+" );
@@ -45,7 +47,7 @@ rtems_task Init(
   puts( "funlockfile /testfile" );
   funlockfile( fd );
   
-  puts( "*** END OF TEST FILE LOCK 01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -57,6 +59,8 @@ rtems_task Init(
 
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
 #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/psxtests/psxgetattrnp01/init.c b/testsuites/psxtests/psxgetattrnp01/init.c
index d5b05ff..df3e335 100644
--- a/testsuites/psxtests/psxgetattrnp01/init.c
+++ b/testsuites/psxtests/psxgetattrnp01/init.c
@@ -18,6 +18,8 @@
 #include <pthread.h>
 #include <rtems/posix/pthreadimpl.h>
 
+const char rtems_test_name[] = "PSXGETATTRNP 1";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -87,7 +89,7 @@ void *POSIX_Init(
   size_t              guardsize;
   struct sched_param  param;
 
-  puts( "\n\n*** POSIX ATTRIBUTE TEST 1 ***" );
+  TEST_BEGIN();
 
   /* Initialize thread id */
   Init_id = pthread_self();
@@ -159,7 +161,7 @@ void *POSIX_Init(
   rtems_test_assert( !sc );
 #endif
 
-  puts( "*** END OF POSIX ATTRIBUTE TEST 1 ***" );
+  TEST_END();
   rtems_test_exit(0);
   return NULL; /* just so the compiler thinks we returned something */
 }
@@ -168,9 +170,9 @@ void *POSIX_Init(
   void *ignored
 )
 {
-  puts( "\n\n*** POSIX ATTRIBUTE TEST 1 ***" );
+  TEST_BEGIN();
   puts( "  pthread_getattr_np NOT supported" );
-  puts( "*** END OF POSIX ATTRIBUTE TEST 1 ***" );
+  TEST_END();
   rtems_test_exit(0);
   return NULL; /* just so the compiler thinks we returned something */
 }
diff --git a/testsuites/psxtests/psxgetrusage01/init.c b/testsuites/psxtests/psxgetrusage01/init.c
index 0663727..590bc20 100644
--- a/testsuites/psxtests/psxgetrusage01/init.c
+++ b/testsuites/psxtests/psxgetrusage01/init.c
@@ -22,12 +22,16 @@ extern int getrusage(int who, struct rusage *usage);
 #include <tmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXGETRUSAGE 1";
+
 /* configuration information */
 
 #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
@@ -41,7 +45,7 @@ rtems_task Init(
   int           sc;
   struct rusage usage;
 
-  puts( "\n\n*** TEST GETRUSAGE 01 ***" );
+  TEST_BEGIN();
 
   puts( "getrusage( RUSAGE_SELF, NULL ) -- EFAULT" );
   sc = getrusage( RUSAGE_SELF, NULL );
@@ -73,7 +77,7 @@ rtems_task Init(
   rtems_test_assert( usage.ru_utime.tv_sec == usage.ru_stime.tv_sec );
   rtems_test_assert( usage.ru_utime.tv_usec == usage.ru_stime.tv_usec );
   
-  puts( "*** END OF TEST GETRUSAGE 01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtests/psxid01/init.c b/testsuites/psxtests/psxid01/init.c
index 87df483..4224840 100644
--- a/testsuites/psxtests/psxid01/init.c
+++ b/testsuites/psxtests/psxid01/init.c
@@ -19,6 +19,8 @@
 #include <limits.h>
 #include <sys/types.h>
 
+const char rtems_test_name[] = "PSXID 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void test_gid(void);
@@ -139,7 +141,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST ID 01 ***" );
+  TEST_BEGIN();
 
   test_gid();
   puts( "" );
@@ -152,7 +154,7 @@ rtems_task Init(
 
   test_getlogin();
 
-  puts( "*** END OF TEST ID 01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -165,6 +167,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS                  1
 /* so we can write /etc/passwd and /etc/group */
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psximfs01/init.c b/testsuites/psxtests/psximfs01/init.c
index 01ddacf..76bb156 100644
--- a/testsuites/psxtests/psximfs01/init.c
+++ b/testsuites/psxtests/psximfs01/init.c
@@ -21,6 +21,8 @@
 #include <errno.h>
 #include <rtems/libcsupport.h>
 
+const char rtems_test_name[] = "PSXIMFS 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void open_it(bool readOnly, bool create);
@@ -223,7 +225,7 @@ rtems_task Init(
   char buf [1];
   ssize_t n;
 
-  puts( "\n\n*** TEST IMFS 01 ***" );
+  TEST_BEGIN();
 
   for (i=0 ; i<sizeof(Buffer) ; i++ )
     Buffer[i] = (uint8_t) i;
@@ -265,7 +267,7 @@ rtems_task Init(
   close_it();
   unlink_it();
 
-  puts( "*** END OF TEST IMFS 01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -278,6 +280,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS             1
 #define CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK 16
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psximfs02/init.c b/testsuites/psxtests/psximfs02/init.c
index 9c4d995..9d45b75 100644
--- a/testsuites/psxtests/psximfs02/init.c
+++ b/testsuites/psxtests/psximfs02/init.c
@@ -23,6 +23,8 @@
 #include <rtems/malloc.h>
 #include <rtems/libcsupport.h>
 
+const char rtems_test_name[] = "PSXIMFS 2";
+
 #if !HAVE_DECL_SETEUID
 extern int seteuid(uid_t euid);
 #endif
@@ -54,7 +56,7 @@ rtems_task Init(
   int i;
   struct stat stat_buf;
 
-  puts( "\n\n*** TEST IMFS 02 ***" );
+  TEST_BEGIN();
 
   puts( "Creating directory /dir00" );
   status = mkdir( "/dir00", S_IRWXU );
@@ -200,7 +202,7 @@ rtems_task Init(
   status = chown( "/fifo", 0, 0 );
   rtems_test_assert( status == 0 );
 
-  puts( "*** END OF TEST IMFS 02 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -212,6 +214,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS                  1
 #define CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK   15
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_INIT
diff --git a/testsuites/psxtests/psxintrcritical01/init.c b/testsuites/psxtests/psxintrcritical01/init.c
index 1bb6583..2c46209 100644
--- a/testsuites/psxtests/psxintrcritical01/init.c
+++ b/testsuites/psxtests/psxintrcritical01/init.c
@@ -15,6 +15,8 @@
 #include <intrcritical.h>
 #include <time.h>
 
+const char rtems_test_name[] = "PSXINTRCRITICAL 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument ignored);
 rtems_timer_service_routine test_release_from_isr(rtems_id timer, void *arg);
@@ -43,7 +45,7 @@ rtems_task Init(
   int    sc;
   int    resets;
 
-  puts( "\n\n*** TEST POSIX INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_BEGIN();
 
   puts( "Init - Trying to generate timer fire from ISR while firing" );
   puts( "Init - Variation is: " TEST_STRING );
@@ -79,7 +81,7 @@ rtems_task Init(
 
   }
 
-  puts( "*** END OF TEST POSIX INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -92,6 +94,8 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TIMERS         1
 #define CONFIGURE_MAXIMUM_POSIX_TIMERS   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/psxtests/psxitimer/init.c b/testsuites/psxtests/psxitimer/init.c
index 72e0eb0..dc32f34 100644
--- a/testsuites/psxtests/psxitimer/init.c
+++ b/testsuites/psxtests/psxitimer/init.c
@@ -15,6 +15,8 @@
 #include <sys/time.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXITIMER";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -26,7 +28,7 @@ void *POSIX_Init(
   struct itimerval itimer;
   struct itimerval otimer;
 
-  puts( "\n\n*** POSIX TEST ITIMER ***" );
+  TEST_BEGIN();
 
   /* test getitimer stub */
   puts( "getitimer -- bad which - EINVAL " );
@@ -74,7 +76,7 @@ void *POSIX_Init(
   status = setitimer( ITIMER_PROF, &itimer, &otimer );
   rtems_test_assert( status == -1 && errno == ENOSYS );
 
-  puts( "*** END OF POSIX TEST ITIMER ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -83,6 +85,8 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS     1
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psxkey01/init.c b/testsuites/psxtests/psxkey01/init.c
index 365b4f7..6b8f57e 100644
--- a/testsuites/psxtests/psxkey01/init.c
+++ b/testsuites/psxtests/psxkey01/init.c
@@ -16,6 +16,8 @@
 #include <errno.h>
 #include "tmacros.h"
 
+const char rtems_test_name[] = "PSXKEY 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 void Key_destructor(void *key_data);
@@ -28,7 +30,7 @@ rtems_task Init(rtems_task_argument argument)
 {
   int    status;
 
-  puts( "\n\n*** POSIX KEY 01 TEST ***" );
+  TEST_BEGIN();
 
   /* get id of this thread */
 
@@ -41,6 +43,6 @@ rtems_task Init(rtems_task_argument argument)
   status = pthread_key_create( &Key_id[0], Key_destructor );
   fatal_directive_check_status_only( status, 0, "OK" );
 
-  puts( "*** END OF POSIX KEY 01 TEST ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/psxtests/psxkey01/system.h b/testsuites/psxtests/psxkey01/system.h
index da42301..dafe5e5 100644
--- a/testsuites/psxtests/psxkey01/system.h
+++ b/testsuites/psxtests/psxkey01/system.h
@@ -23,6 +23,8 @@
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_TASKS          1
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     1
 
diff --git a/testsuites/psxtests/psxkey02/init.c b/testsuites/psxtests/psxkey02/init.c
index 6a3cf2a..684eb4a 100644
--- a/testsuites/psxtests/psxkey02/init.c
+++ b/testsuites/psxtests/psxkey02/init.c
@@ -17,6 +17,8 @@
 #include "tmacros.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "PSXKEY 2";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument ignored);
 
@@ -30,7 +32,7 @@ rtems_task Init(rtems_task_argument ignored)
   rtems_resource_snapshot snapshot;
   void                   *greedy;
 
-  puts( "\n\n*** TEST KEY 02 ***" );
+  TEST_BEGIN();
 
   greedy = rtems_workspace_greedy_allocate_all_except_largest( &to_alloc );
   rtems_resource_snapshot_take( &snapshot );
@@ -73,7 +75,7 @@ rtems_task Init(rtems_task_argument ignored)
 
   rtems_workspace_greedy_free( greedy );
 
-  puts( "*** END OF TEST KEY 02 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -82,6 +84,8 @@ rtems_task Init(rtems_task_argument ignored)
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_TASKS          1
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     1
 
diff --git a/testsuites/psxtests/psxkey03/init.c b/testsuites/psxtests/psxkey03/init.c
index 222bf4b..b133e50 100644
--- a/testsuites/psxtests/psxkey03/init.c
+++ b/testsuites/psxtests/psxkey03/init.c
@@ -16,6 +16,8 @@
 #include "tmacros.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "PSXKEY 3";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument value );
 rtems_task Test_Thread( rtems_task_argument value );
@@ -50,7 +52,7 @@ rtems_task Init(rtems_task_argument ignored)
   int               sc;
   struct timespec   delay_request;
 
-  puts( "\n\n*** TEST KEY 03 ***" );
+  TEST_BEGIN();
 
   /*
    *  Key with NULL destructor
@@ -116,7 +118,7 @@ rtems_task Init(rtems_task_argument ignored)
   sc = pthread_key_delete( Key );
   rtems_test_assert( sc == 0 );
 
-  puts( "*** END OF TEST KEY 03 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -125,6 +127,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_MAXIMUM_TASKS          2
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     1
 
diff --git a/testsuites/psxtests/psxkey04/init.c b/testsuites/psxtests/psxkey04/init.c
index 5a56ece..4dcc342 100644
--- a/testsuites/psxtests/psxkey04/init.c
+++ b/testsuites/psxtests/psxkey04/init.c
@@ -17,6 +17,8 @@
 #include "tmacros.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "PSXKEY 4";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Test_Thread1(rtems_task_argument argument);
@@ -72,7 +74,7 @@ rtems_task Init( rtems_task_argument ignored )
   rtems_status_code rc;
   struct timespec   delay_request;
 
-  puts( "\n\n*** TEST KEY 04 ***" );
+  TEST_BEGIN();
 
   puts( "Init - pthread_key_create - OK" );
   sc = pthread_key_create( &Key, NULL );
@@ -115,7 +117,7 @@ rtems_task Init( rtems_task_argument ignored )
   sc = pthread_key_delete( Key );
   rtems_test_assert( sc == 0 );
 
-  puts( "*** END OF TEST KEY 04 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -124,6 +126,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_MAXIMUM_TASKS          3
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     1
 
diff --git a/testsuites/psxtests/psxkey05/init.c b/testsuites/psxtests/psxkey05/init.c
index 9fdd968..6ebe49f 100644
--- a/testsuites/psxtests/psxkey05/init.c
+++ b/testsuites/psxtests/psxkey05/init.c
@@ -17,6 +17,8 @@
 #include "tmacros.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "PSXKEY 5";
+
 /* forward declarations to avoid warnings */
 rtems_task Init( rtems_task_argument ignored );
 
@@ -26,7 +28,7 @@ rtems_task Init( rtems_task_argument ignored )
   int              sc, *value;
   int Data_array[2] = {1, 2};
 
-  puts( "\n\n*** TEST KEY 05 ***" );
+  TEST_BEGIN();
 
   puts( "Init - pthread key1 create - OK" );
   sc = pthread_key_create( &key1, NULL );
@@ -68,7 +70,7 @@ rtems_task Init( rtems_task_argument ignored )
   sc = pthread_key_delete( key2 );
   rtems_test_assert( sc == 0 );
 
-  puts( "*** END OF TEST KEY 05 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -77,6 +79,8 @@ rtems_task Init( rtems_task_argument ignored )
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_TASKS          1
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     2
 
diff --git a/testsuites/psxtests/psxkey06/init.c b/testsuites/psxtests/psxkey06/init.c
index a9b9a6f..2e4804d 100644
--- a/testsuites/psxtests/psxkey06/init.c
+++ b/testsuites/psxtests/psxkey06/init.c
@@ -17,6 +17,8 @@
 #include "tmacros.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "PSXKEY 6";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Test_Thread1(rtems_task_argument argument);
@@ -89,7 +91,7 @@ rtems_task Init( rtems_task_argument ignored )
   int               sc;
   struct timespec   delay_request;
 
-  puts( "\n\n*** TEST KEY 06 ***" );
+  TEST_BEGIN();
 
   puts( "Init - pthread key1 create - OK" );
   sc = pthread_key_create( &key1, NULL );
@@ -141,7 +143,7 @@ rtems_task Init( rtems_task_argument ignored )
   sc = pthread_key_delete( key2 );
   rtems_test_assert( sc == 0 );
 
-  puts( "*** END OF TEST KEY 06 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -150,6 +152,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_MAXIMUM_TASKS          3
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     2
 
diff --git a/testsuites/psxtests/psxkey07/init.c b/testsuites/psxtests/psxkey07/init.c
index e9d879c..ac7e025 100644
--- a/testsuites/psxtests/psxkey07/init.c
+++ b/testsuites/psxtests/psxkey07/init.c
@@ -18,6 +18,8 @@
 #include "tmacros.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "PSXKEY 7";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Test_Thread(rtems_task_argument argument);
@@ -67,7 +69,7 @@ rtems_task Init(rtems_task_argument argument)
 
   all_thread_created = 0;
 
-  puts( "\n\n*** TEST KEY 07 ***" );
+  TEST_BEGIN();
 
   puts( "Init - Mutex 1 create - OK" );
   sc = pthread_mutex_init( &mutex1, NULL );
@@ -182,7 +184,7 @@ rtems_task Init(rtems_task_argument argument)
   sc = pthread_cond_destroy( &set_condition_var );
   rtems_test_assert( !sc );
 
-  puts( "*** END OF TEST KEY 07 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -191,6 +193,8 @@ rtems_task Init(rtems_task_argument argument)
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_TASKS          rtems_resource_unlimited(10)
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES  2
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     1
diff --git a/testsuites/psxtests/psxkey08/init.c b/testsuites/psxtests/psxkey08/init.c
index 420cc32..14ff823 100644
--- a/testsuites/psxtests/psxkey08/init.c
+++ b/testsuites/psxtests/psxkey08/init.c
@@ -20,6 +20,8 @@
 #include <unistd.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXKEY 8";
+
 pthread_key_t Key;
 int created_task_count, setted_task_count, got_task_count;
 int all_thread_created;
@@ -62,7 +64,7 @@ rtems_task Init(rtems_task_argument arg)
 
   all_thread_created = 0;
 
-  puts( "\n\n*** TEST KEY 08 ***" );
+  TEST_BEGIN();
 
   puts( "Init - Semaphore 1 create - OK" );
   name1 = rtems_build_name('S', 'E', 'M', '1');
@@ -158,7 +160,7 @@ rtems_task Init(rtems_task_argument arg)
   sc = rtems_semaphore_delete( sema2 );
   rtems_test_assert( !sc );
 
-  puts( "*** END OF TEST KEY 08***" );
+  TEST_END();
   exit(0);
 }
 
@@ -174,6 +176,8 @@ rtems_task Init(rtems_task_argument arg)
   (RTEMS_PREEMPT | RTEMS_NO_TIMESLICE | RTEMS_ASR | RTEMS_INTERRUPT_LEVEL(0))
 
 #define CONFIGURE_INIT_TASK_PRIORITY 4
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_UNIFIED_WORK_AREAS
diff --git a/testsuites/psxtests/psxkey09/init.c b/testsuites/psxtests/psxkey09/init.c
index badf40c..2f7e92a 100644
--- a/testsuites/psxtests/psxkey09/init.c
+++ b/testsuites/psxtests/psxkey09/init.c
@@ -17,6 +17,7 @@
 #include "tmacros.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "PSXKEY 9";
 
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
@@ -53,7 +54,7 @@ rtems_task Init( rtems_task_argument ignored )
   int               sc;
   struct timespec   delay_request;
 
-  puts( "\n\n*** TEST KEY 09 ***" );
+  TEST_BEGIN();
 
   puts( "Init - pthread key create with destructor - OK" );
   sc = pthread_key_create( &key, destructor );
@@ -86,7 +87,7 @@ rtems_task Init( rtems_task_argument ignored )
   sc = pthread_key_delete( key );
   rtems_test_assert( sc == 0 );
 
-  puts( "*** END OF TEST KEY 09 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -95,6 +96,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_MAXIMUM_TASKS          2
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     1
 
diff --git a/testsuites/psxtests/psxkey10/init.c b/testsuites/psxtests/psxkey10/init.c
index 9e1216f..1c6ebd8 100644
--- a/testsuites/psxtests/psxkey10/init.c
+++ b/testsuites/psxtests/psxkey10/init.c
@@ -17,6 +17,8 @@
 #include "tmacros.h"
 #include "pmacros.h"
 
+const char rtems_test_name[] = "PSXKEY 10";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 rtems_task Test_Thread(rtems_task_argument argument);
@@ -57,7 +59,7 @@ rtems_task Init( rtems_task_argument ignored )
   int               sc;
   struct timespec   delay_request;
 
-  puts( "\n\n*** TEST KEY 10 ***" );
+  TEST_BEGIN();
 
   puts( "Init - pthread key create with destructor - OK" );
   sc = pthread_key_create( &key, destructor );
@@ -90,7 +92,7 @@ rtems_task Init( rtems_task_argument ignored )
   /* sc = pthread_key_delete( key ); */
   /* rtems_test_assert( sc == 0 ); */
 
-  puts( "*** END OF TEST KEY 10 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -99,6 +101,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_MAXIMUM_TASKS          2
 #define CONFIGURE_MAXIMUM_POSIX_KEYS     1
 
diff --git a/testsuites/psxtests/psxmount/main.c b/testsuites/psxtests/psxmount/main.c
index 63d95a2..92ddb3e 100644
--- a/testsuites/psxtests/psxmount/main.c
+++ b/testsuites/psxtests/psxmount/main.c
@@ -36,6 +36,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/psxtests/psxmount/test.c b/testsuites/psxtests/psxmount/test.c
index 1bc4993..57f43db 100644
--- a/testsuites/psxtests/psxmount/test.c
+++ b/testsuites/psxtests/psxmount/test.c
@@ -26,6 +26,8 @@
 #include <rtems/libio.h>
 #include <pmacros.h>
 
+const char rtems_test_name[] = "PSXMOUNT";
+
 /* forward declarations to avoid warnings */
 int test_main(void);
 
@@ -90,7 +92,7 @@ int main(
   static const char my_link [] = "/c/y/my_link";
   static const char mount_point [] = "/c/y/my_mount_point";
 
-  printf( "\n\n*** MOUNT/UNMOUNT TEST ***\n" );
+  TEST_BEGIN();
 
   /*
    * Change directory to the root and create files under
@@ -466,6 +468,6 @@ int main(
   rtems_test_assert( status == -1 );
   rtems_test_assert( errno == ENOENT );
 
-  printf( "\n\n*** END OF MOUNT/UNMOUNT TEST ***\n" );
+  TEST_END();
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c
index 0f4bb32..5d544dd 100644
--- a/testsuites/psxtests/psxmsgq01/init.c
+++ b/testsuites/psxtests/psxmsgq01/init.c
@@ -20,6 +20,8 @@
 #include <signal.h>   /* signal facilities */
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXMSGQ 1";
+
 /* forward declarations to avoid warnings */
 void Start_Test(char *description);
 void Validate_attributes(mqd_t mq, int oflag, int msg_count);
@@ -1272,7 +1274,7 @@ void *POSIX_Init(
   void *argument
 )
 {
-  puts( "\n\n*** POSIX MESSAGE QUEUE TEST ***" );
+  TEST_BEGIN();
 
   validate_mq_open_error_codes( );
   open_test_queues();
@@ -1291,7 +1293,7 @@ void *POSIX_Init(
   verify_mq_receive();
   verify_mq_send();
 
-  puts( "*** END OF POSIX MESSAGE QUEUE TEST ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psxmsgq01/system.h b/testsuites/psxtests/psxmsgq01/system.h
index 3c39a94..764f733 100644
--- a/testsuites/psxtests/psxmsgq01/system.h
+++ b/testsuites/psxtests/psxmsgq01/system.h
@@ -34,6 +34,8 @@ void *Task_5(void *argument);
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS         5
 #define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES 10
 #define CONFIGURE_MAXIMUM_POSIX_TIMERS          4
diff --git a/testsuites/psxtests/psxmsgq02/init.c b/testsuites/psxtests/psxmsgq02/init.c
index 3364168..290663d 100644
--- a/testsuites/psxtests/psxmsgq02/init.c
+++ b/testsuites/psxtests/psxmsgq02/init.c
@@ -23,6 +23,8 @@
 #include <signal.h>   /* signal facilities */
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXMSGQ 2";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -35,7 +37,7 @@ void *POSIX_Init(
   struct mq_attr         attr;
   mqd_t                  mq;
 
-  puts( "\n\n*** POSIX MESSAGE QUEUE 02 TEST ***" );
+  TEST_BEGIN();
 
 
   /* set the time of day, and print our buffer in multiple ways */
@@ -55,7 +57,7 @@ void *POSIX_Init(
   mq = mq_open( Get_Longest_Name(), O_CREAT, 0x777, &attr );
   fatal_posix_service_status_errno(mq, ENOMEM, "no workspace available");
 
-  puts( "*** END OF POSIX MESSAGE QUEUE 02 TEST ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psxmsgq02/system.h b/testsuites/psxtests/psxmsgq02/system.h
index 9a131a7..180879e 100644
--- a/testsuites/psxtests/psxmsgq02/system.h
+++ b/testsuites/psxtests/psxmsgq02/system.h
@@ -30,6 +30,8 @@ void *POSIX_Init(
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS         5
 #define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES 10
 
diff --git a/testsuites/psxtests/psxmsgq03/init.c b/testsuites/psxtests/psxmsgq03/init.c
index d830389..1464442 100644
--- a/testsuites/psxtests/psxmsgq03/init.c
+++ b/testsuites/psxtests/psxmsgq03/init.c
@@ -20,6 +20,8 @@
 
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXMSGQ 3";
+
 /* forward declarations to avoid warnings */
 rtems_timer_service_routine mq_send_timer(rtems_id timer, void *arg);
 
@@ -50,7 +52,7 @@ void *POSIX_Init(
   rtems_id           timer;
   rtems_status_code  rc;
 
-  puts( "\n\n*** POSIX MESSAGE QUEUE TEST 3 ***" );
+  TEST_BEGIN();
 
   attr.mq_maxmsg  = 1;
   attr.mq_msgsize = sizeof(int);
@@ -106,7 +108,7 @@ void *POSIX_Init(
 
   puts( "Init - mq_send from ISR returned correct status" );
 
-  puts( "*** END OF POSIX MESSAGE QUEUE TEST 3 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psxmsgq03/system.h b/testsuites/psxtests/psxmsgq03/system.h
index cd405ea..6be55ce 100644
--- a/testsuites/psxtests/psxmsgq03/system.h
+++ b/testsuites/psxtests/psxmsgq03/system.h
@@ -30,6 +30,8 @@ void *POSIX_Init(
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        1
 #define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES 1
 #define CONFIGURE_MAXIMUM_TIMERS               1
diff --git a/testsuites/psxtests/psxmsgq04/init.c b/testsuites/psxtests/psxmsgq04/init.c
index 5b59c60..7086cbe 100644
--- a/testsuites/psxtests/psxmsgq04/init.c
+++ b/testsuites/psxtests/psxmsgq04/init.c
@@ -22,6 +22,8 @@
 
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXMSGQ 4";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -38,7 +40,7 @@ void *POSIX_Init(
   bool                    sb;
   const char             *name;
 
-  puts( "\n\n*** POSIX MESSAGE QUEUE TEST 4 ***" );
+  TEST_BEGIN();
 
   attr.mq_maxmsg = 1;
   attr.mq_msgsize = sizeof(int);
@@ -114,7 +116,7 @@ void *POSIX_Init(
       perror( "mq_close failed" );
     rtems_test_assert( sc == 0 );
 
-  puts( "*** END OF POSIX MESSAGE QUEUE TEST 4 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
@@ -131,6 +133,8 @@ void *POSIX_Init(
 #define CONFIGURE_MESSAGE_BUFFER_MEMORY \
     (2 * CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE(1, sizeof(int)))
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS                   1
 #define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES            1
 #define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUE_DESCRIPTORS 2
diff --git a/testsuites/psxtests/psxmutexattr01/init.c b/testsuites/psxtests/psxmutexattr01/init.c
index 64e6ff4..1ea1ab5 100644
--- a/testsuites/psxtests/psxmutexattr01/init.c
+++ b/testsuites/psxtests/psxmutexattr01/init.c
@@ -15,6 +15,8 @@
 #include <errno.h>
 #include <pthread.h>
 
+const char rtems_test_name[] = "PSXMUTEXATTR 1";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -45,7 +47,7 @@ void *POSIX_Init(
   int                 type;
   int                 i;
 
-  puts( "\n\n*** POSIX MUTEX ATTRIBUTE TEST 1 ***" );
+  TEST_BEGIN();
 
 #if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
   puts( "Init - pthread_mutexattr_gettype - attr NULL - EINVAL" );
@@ -103,7 +105,7 @@ void *POSIX_Init(
   puts( "POSIX Mutex Attribute Type Not Supported in Tools" );
 #endif
 
-  puts( "*** END OF POSIX MUTEX ATTRIBUTE TEST 1 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -112,6 +114,8 @@ void *POSIX_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_MAXIMUM_POSIX_THREADS  1
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psxobj01/init.c b/testsuites/psxtests/psxobj01/init.c
index a37072e..27d32b3 100644
--- a/testsuites/psxtests/psxobj01/init.c
+++ b/testsuites/psxtests/psxobj01/init.c
@@ -20,6 +20,8 @@
 
 #include <rtems/score/objectimpl.h>
 
+const char rtems_test_name[] = "PSXOBJ 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument ignored);
 
@@ -33,7 +35,7 @@ rtems_task Init(
   char                             name[64];
   bool                             bc;
 
-  puts( "\n\n*** POSIX OBJECT TEST 1 ***" );
+  TEST_BEGIN();
 
   /* very fake object class to test with */
   _Objects_Initialize_information(
@@ -80,7 +82,7 @@ rtems_task Init(
   bc = _Objects_Set_name( &TestClass, &_Thread_Get_executing()->Object, name );
   rtems_test_assert( bc == false );
 
-  puts( "*** END OF POSIX OBJECT TEST 1 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -90,6 +92,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/psxtests/psxonce01/init.c b/testsuites/psxtests/psxonce01/init.c
index cd3eb2a..1c90769 100644
--- a/testsuites/psxtests/psxonce01/init.c
+++ b/testsuites/psxtests/psxonce01/init.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "PSXONCE 1";
+
 static pthread_once_t nesting_once = PTHREAD_ONCE_INIT;
 
 static void Test_init_routine_nesting( void )
@@ -38,7 +40,7 @@ rtems_task Init(rtems_task_argument argument)
   int status;
   pthread_once_t once = PTHREAD_ONCE_INIT;
 
-  puts( "\n\n*** TEST POSIX ONCE 01 ***" );
+  TEST_BEGIN();
 
   puts( "Init: pthread_once - EINVAL (NULL once_control)" );
   status = pthread_once( NULL, Test_init_routine );
@@ -64,6 +66,6 @@ rtems_task Init(rtems_task_argument argument)
   status = pthread_once( &nesting_once, Test_init_routine_nesting );
   rtems_test_assert( !status );
 
-  puts( "*** END OF TEST POSIX ONCE 01 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/psxtests/psxpasswd01/init.c b/testsuites/psxtests/psxpasswd01/init.c
index 7673afe..cc618a5 100644
--- a/testsuites/psxtests/psxpasswd01/init.c
+++ b/testsuites/psxtests/psxpasswd01/init.c
@@ -17,6 +17,8 @@
 #include <pwd.h>
 #include <grp.h>
 
+const char rtems_test_name[] = "PSXPASSWD 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument ignored);
 void print_passwd(struct passwd *pw);
@@ -67,7 +69,7 @@ rtems_task Init(
   struct passwd *pw;
   struct group  *gr;
 
-  puts( "*** PASSWORD/GROUP TEST - 01 ***" );
+  TEST_BEGIN();
 
   /* getpwent */
   puts( "Init - getpwent() -- OK, result should be NULL" );
@@ -195,7 +197,7 @@ rtems_task Init(
   puts( "Init - endgrent() -- OK" );
   endgrent();
 
-  puts( "*** END OF PASSWORD/GROUP TEST - 01 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -208,6 +210,8 @@ rtems_task Init(
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
 
 #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/psxtests/psxpasswd02/init.c b/testsuites/psxtests/psxpasswd02/init.c
index 825b0c9..7248003 100644
--- a/testsuites/psxtests/psxpasswd02/init.c
+++ b/testsuites/psxtests/psxpasswd02/init.c
@@ -21,6 +21,8 @@
 #include <errno.h>
 #include <limits.h>
 
+const char rtems_test_name[] = "PSXPASSWD 2";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument ignored);
 void print_passwd(struct passwd *pw);
@@ -76,7 +78,7 @@ rtems_task Init(
 
   FILE *fp = NULL;
 
-  puts( "*** PASSWORD/GROUP TEST - 02 ***" );
+  TEST_BEGIN();
 
   puts( "Init - Creating /etc" );
   status = mkdir( "/etc", 0777 );
@@ -211,7 +213,7 @@ rtems_task Init(
   rtems_test_assert( !gr );
   rtems_test_assert( errno == EINVAL );
   
-  puts( "*** END OF PASSWORD/GROUP TEST - 02 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -224,6 +226,8 @@ rtems_task Init(
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
 
 #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/psxtests/psxpipe01/init.c b/testsuites/psxtests/psxpipe01/init.c
index b8b99aa..145cf81 100644
--- a/testsuites/psxtests/psxpipe01/init.c
+++ b/testsuites/psxtests/psxpipe01/init.c
@@ -21,6 +21,8 @@
 #include <rtems/libcsupport.h>
 #include <rtems/malloc.h>
 
+const char rtems_test_name[] = "PSXPIPE 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument ignored);
 
@@ -33,7 +35,7 @@ rtems_task Init(
   int status = 0;
   void *opaque = NULL;
 
-  puts( "*** TEST POSIX PIPE CREATION - 01 ***" );
+  TEST_BEGIN();
 
   puts( "Init - attempt to create pipe -- expect EFAULT" );
   status = pipe( NULL );
@@ -91,7 +93,7 @@ rtems_task Init(
   status |= unlink( "/file01" );
   rtems_test_assert( status == 0 );
 
-  puts( "*** END OF TEST POSIX PIPE CREATION - 01 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
@@ -104,6 +106,8 @@ rtems_task Init(
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
 
 #define CONFIGURE_MAXIMUM_TASKS 1
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
 #define CONFIGURE_PIPES_ENABLED
diff --git a/testsuites/psxtests/psxrdwrv/main.c b/testsuites/psxtests/psxrdwrv/main.c
index c8a5917..2e2d309 100644
--- a/testsuites/psxtests/psxrdwrv/main.c
+++ b/testsuites/psxtests/psxrdwrv/main.c
@@ -38,6 +38,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/psxtests/psxrdwrv/test.c b/testsuites/psxtests/psxrdwrv/test.c
index 43792c3..d3adf14 100644
--- a/testsuites/psxtests/psxrdwrv/test.c
+++ b/testsuites/psxtests/psxrdwrv/test.c
@@ -37,6 +37,8 @@
   #include <rtems.h>
   #include <rtems/libio.h>
   #include <pmacros.h>
+
+  const char rtems_test_name[] = "PSXRDWRV";
 #else
   #define TRUE  1
   #define FALSE 0
@@ -424,7 +426,7 @@ int main(
 )
 #endif
 {
-  puts( "*** POSIX TEST READV/WRITEV ***" );
+  TEST_BEGIN();
 
   if ( fillPatternBuffer() != TRUE ) {
     puts("Error filling pattern buffer" );
@@ -441,6 +443,6 @@ int main(
   }
 
   unlink(TESTFILE);
-  puts( "*** END OF TEST PSXRDWRV ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtests/psxreaddir/main.c b/testsuites/psxtests/psxreaddir/main.c
index ad0a473..a76838d 100644
--- a/testsuites/psxtests/psxreaddir/main.c
+++ b/testsuites/psxtests/psxreaddir/main.c
@@ -34,6 +34,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/psxtests/psxreaddir/test.c b/testsuites/psxtests/psxreaddir/test.c
index 78e5d7c..c793931 100644
--- a/testsuites/psxtests/psxreaddir/test.c
+++ b/testsuites/psxtests/psxreaddir/test.c
@@ -40,6 +40,8 @@
 #include <errno.h>
 #include <rtems/imfs.h>
 
+const char rtems_test_name[] = "PSXREADDIR";
+
 /* forward declarations to avoid warnings */
 int test_main(void);
 void printdir(DIR *directory);
@@ -253,7 +255,7 @@ int main(
   struct stat s;
 
 
-  printf( "\n\n*** READDIR TEST ***\n" );
+  TEST_BEGIN();
 
   printf( "\nchdir to the root directory\n" );
   status = chdir( "/" );
@@ -531,6 +533,6 @@ int main(
   rtems_test_assert ( status == 0 );
 
   test_across_mount();
-  printf( "\n\n*** END OF READDIR TEST ***\n" );
+  TEST_END();
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtests/psxrwlock01/main.c b/testsuites/psxtests/psxrwlock01/main.c
index 9c2b50a..3719b32 100644
--- a/testsuites/psxtests/psxrwlock01/main.c
+++ b/testsuites/psxtests/psxrwlock01/main.c
@@ -13,6 +13,7 @@
 #include "config.h"
 #endif
 
+#include <rtems/test.h>
 #include <bsp.h>
 #include <pmacros.h>
 
@@ -35,9 +36,13 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 2
 #define CONFIGURE_MAXIMUM_POSIX_RWLOCKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 #define CONFIGURE_INIT_TASK_PRIORITY      2
diff --git a/testsuites/psxtests/psxrwlock01/test.c b/testsuites/psxtests/psxrwlock01/test.c
index 5ec22c2..f91f983 100644
--- a/testsuites/psxtests/psxrwlock01/test.c
+++ b/testsuites/psxtests/psxrwlock01/test.c
@@ -25,6 +25,8 @@
 /* #define __USE_XOPEN2K XXX already defined on GNU/Linux */
 #include <pthread.h>
 
+const char rtems_test_name[] = "PSXRWLOCK 1";
+
 /* forward declarations to avoid warnings */
 void *ReadLockThread(void *arg);
 void *WriteLockThread(void *arg);
@@ -108,7 +110,7 @@ int main(
   int                  i;
   struct timespec      abstime;
 
-  puts( "\n\n*** POSIX RWLOCK TEST 01 ***" );
+  TEST_BEGIN();
 
   /*************** NULL POINTER CHECKS *****************/
   puts( "pthread_rwlockattr_init( NULL ) -- EINVAL" );
@@ -483,6 +485,6 @@ int main(
   rtems_test_assert( status == 0 );
 
   /*************** END OF TEST *****************/
-  puts( "*** END OF POSIX RWLOCK TEST 01 ***" );
+  TEST_END();
   exit(0);
 }
diff --git a/testsuites/psxtests/psxsem01/init.c b/testsuites/psxtests/psxsem01/init.c
index 0863d9e..ed741bd 100644
--- a/testsuites/psxtests/psxsem01/init.c
+++ b/testsuites/psxtests/psxsem01/init.c
@@ -20,6 +20,8 @@
 #include <pmacros.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXSEM 1";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -49,7 +51,7 @@ void *POSIX_Init(
   struct timespec waittime;
   char            failure_msg[80];
 
-  puts( "\n\n*** POSIX SEMAPHORE MANAGER TEST 1 ***" );
+  TEST_BEGIN();
 
   puts( "Init: sem_init - UNSUCCESSFUL (EINVAL)" );
   status = sem_init(NULL, 0, 1);
@@ -306,7 +308,7 @@ void *POSIX_Init(
 
   /* Try adding in unlinking before closing... (can we still open?) */
 
-  puts( "*** END OF POSIX SEMAPHORE MANAGER TEST 1 ***" );
+  TEST_END();
   rtems_test_exit(0);
 
   return NULL; /* just so the compiler thinks we returned something */
@@ -318,6 +320,8 @@ void *POSIX_Init(
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS     1
 #define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES  MAX_SEMS
 
diff --git a/testsuites/psxtests/psxsignal01/init.c b/testsuites/psxtests/psxsignal01/init.c
index 12a28fa..511dd2d 100644
--- a/testsuites/psxtests/psxsignal01/init.c
+++ b/testsuites/psxtests/psxsignal01/init.c
@@ -17,6 +17,8 @@
 #include <errno.h>
 #include <reent.h>
 
+const char rtems_test_name[] = "PSXSIGNAL 1";
+
 /* forward declarations to avoid warnings */
 int test_main(void);
 void Handler_1(int signo);
@@ -104,7 +106,7 @@ void *POSIX_Init(
   sighandler_t      newHandler;
   rtems_interval start, end;
 
-  puts( "\n\n*** POSIX TEST SIGNAL ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -233,7 +235,7 @@ void *POSIX_Init(
   Signal_occurred = 0;
 
   puts("*** Validate unexpected program termination ***");
-  puts( "*** END OF POSIX TEST SIGNAL ***" );
+  TEST_END();
   _POSIX_signals_Abnormal_termination_handler( SIGUSR1 );
   status = sleep( 1 );
 
diff --git a/testsuites/psxtests/psxsignal01/system.h b/testsuites/psxtests/psxsignal01/system.h
index 932178a..fb88dd5 100644
--- a/testsuites/psxtests/psxsignal01/system.h
+++ b/testsuites/psxtests/psxsignal01/system.h
@@ -37,6 +37,8 @@ void *Task_3(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        4
 #define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 5
 
diff --git a/testsuites/psxtests/psxsignal02/init.c b/testsuites/psxtests/psxsignal02/init.c
index 497d582..6ae68d6 100644
--- a/testsuites/psxtests/psxsignal02/init.c
+++ b/testsuites/psxtests/psxsignal02/init.c
@@ -17,6 +17,8 @@
 #include <pthread.h>
 #include <sched.h>
 
+const char rtems_test_name[] = "PSXSIGNAL 2";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Test_Thread(void *arg);
@@ -134,7 +136,7 @@ void *POSIX_Init(
   struct sigaction    act;
   struct timespec     delay_request;
 
-  puts( "\n\n*** POSIX TEST SIGNAL 02 ***" );
+  TEST_BEGIN();
 
   Signal_occurred = false;
 
@@ -182,7 +184,7 @@ void *POSIX_Init(
   /* we are just scheduling the signal, not delivering it */
   rtems_test_assert( Signal_occurred == false );
 
-  puts( "*** END OF POSIX TEST SIGNAL 02 ***" );
+  TEST_END();
   rtems_test_exit(0);
 
   return NULL; /* just so the compiler thinks we returned something */
@@ -194,6 +196,8 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
 #define CONFIGURE_MICROSECONDS_PER_TICK        1000
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        9
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psxsignal03/init.c b/testsuites/psxtests/psxsignal03/init.c
index 1e2cba4..253064f 100644
--- a/testsuites/psxtests/psxsignal03/init.c
+++ b/testsuites/psxtests/psxsignal03/init.c
@@ -12,7 +12,7 @@
 #endif
 
 #if defined(USE_USER_SIGNALS_PROCESS)
-  #define TEST_NAME                "03"
+  #define TEST_NAME                "PSXSIGNAL 3"
   #define TEST_STRING              "User Signals to Process"
   #define SIGNAL_ONE               SIGUSR1
   #define SIGNAL_TWO               SIGUSR2
@@ -20,7 +20,7 @@
   #define TO_PROCESS
 
 #elif defined(USE_REAL_TIME_SIGNALS_PROCESS)
-  #define TEST_NAME                "04"
+  #define TEST_NAME                "PSXSIGNAL 4"
   #define TEST_STRING              "Real-Time Signals to Process"
   #define SIGNAL_ONE               SIGRTMIN
   #define SIGNAL_TWO               SIGRTMAX
@@ -28,7 +28,7 @@
   #define TO_PROCESS
 
 #elif defined(USE_USER_SIGNALS_THREAD)
-  #define TEST_NAME                "05"
+  #define TEST_NAME                "PSXSIGNAL 5"
   #define TEST_STRING              "User Signals to Thread"
   #define SIGNAL_ONE               SIGUSR1
   #define SIGNAL_TWO               SIGUSR2
@@ -36,7 +36,7 @@
   #define TO_THREAD
 
 #elif defined(USE_REAL_TIME_SIGNALS_THREAD)
-  #define TEST_NAME                "05"
+  #define TEST_NAME                "PSXSIGNAL 5"
   #define TEST_STRING              "Real-Time Signals to Thread"
   #define SIGNAL_ONE               SIGRTMIN
   #define SIGNAL_TWO               SIGRTMAX
@@ -53,6 +53,8 @@
 #include <pthread.h>
 #include <sched.h>
 
+const char rtems_test_name[] = TEST_NAME;
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Test_Thread(void *arg);
@@ -157,7 +159,7 @@ void *POSIX_Init(
   bool                falseArg = false;
   struct timespec     delay_request;
 
-  puts( "\n\n*** POSIX TEST SIGNAL " TEST_NAME " ***" );
+  TEST_BEGIN();
   puts( "Init - Variation is: " TEST_STRING );
 
   Signal_occurred = false;
@@ -208,7 +210,7 @@ void *POSIX_Init(
   /* we are just sigwait'ing the signal, not delivering it */
   rtems_test_assert( Signal_occurred == true );
 
-  puts( "*** END OF POSIX TEST SIGNAL " TEST_NAME " ***" );
+  TEST_END();
   rtems_test_exit(0);
 
   return NULL; /* just so the compiler thinks we returned something */
@@ -219,6 +221,8 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        3
 #define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 1
 
diff --git a/testsuites/psxtests/psxsignal05/init.c b/testsuites/psxtests/psxsignal05/init.c
index c495773..0bc8d7f 100644
--- a/testsuites/psxtests/psxsignal05/init.c
+++ b/testsuites/psxtests/psxsignal05/init.c
@@ -11,7 +11,7 @@
 #include "config.h"
 #endif
 
-#define TEST_NAME                "05"
+#define TEST_NAME                "PSXSIGNAL 5"
 #define TEST_STRING              "User Signals"
 #define SIGNAL_ONE               SIGUSR1
 #define SIGNAL_TWO               SIGUSR2
@@ -22,6 +22,8 @@
 #include <errno.h>
 #include <rtems/posix/psignalimpl.h>
 
+const char rtems_test_name[] = TEST_NAME;
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void Signal_handler(int signo, siginfo_t *info, void *arg);
@@ -58,7 +60,7 @@ void *POSIX_Init(
   siginfo_t           info;
   bool                bc;
 
-  puts( "\n\n*** POSIX TEST SIGNAL " TEST_NAME " ***" );
+  TEST_BEGIN();
 
   act.sa_handler = NULL;
   act.sa_sigaction = Signal_handler;
@@ -84,7 +86,7 @@ void *POSIX_Init(
   );
   rtems_test_assert( bc );
 
-  puts( "*** END OF POSIX TEST SIGNAL " TEST_NAME " ***" );
+  TEST_END();
   rtems_test_exit(0);
 
   return NULL; /* just so the compiler thinks we returned something */
@@ -95,6 +97,8 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        1
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psxsignal06/init.c b/testsuites/psxtests/psxsignal06/init.c
index 775a62e..decab51 100644
--- a/testsuites/psxtests/psxsignal06/init.c
+++ b/testsuites/psxtests/psxsignal06/init.c
@@ -16,6 +16,8 @@
 #include <pthread.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXSIGNAL 6";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void Handler(int signo);
@@ -75,7 +77,7 @@ void *POSIX_Init(void *argument)
 {
   int status;
 
-  puts( "\n\n*** POSIX TEST SIGNAL 06 ***" );
+  TEST_BEGIN();
 
   puts( "Init: pthread_cond_init - OK" );
   status = pthread_cond_init( &CondVarId, NULL );
@@ -111,7 +113,7 @@ void *POSIX_Init(void *argument)
 
 
 
-  puts( "*** END OF POSIX TEST SIGNAL 06 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -121,6 +123,8 @@ void *POSIX_Init(void *argument)
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS             2
 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 2
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES             1
diff --git a/testsuites/psxtests/psxspin01/main.c b/testsuites/psxtests/psxspin01/main.c
index aa889bf..6793784 100644
--- a/testsuites/psxtests/psxspin01/main.c
+++ b/testsuites/psxtests/psxspin01/main.c
@@ -43,6 +43,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_POSIX_SPINLOCKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 #define CONFIGURE_INIT_TASK_PRIORITY      2
diff --git a/testsuites/psxtests/psxspin01/test.c b/testsuites/psxtests/psxspin01/test.c
index 76d3abc..f6fda64 100644
--- a/testsuites/psxtests/psxspin01/test.c
+++ b/testsuites/psxtests/psxspin01/test.c
@@ -26,6 +26,8 @@
 
 #include <rtems.h>  /* for task creation */
 
+const char rtems_test_name[] = "PSXSPIN 1";
+
 /* forward declarations to avoid warnings */
 int test_main(void);
 rtems_task SpinlockThread(rtems_task_argument arg);
@@ -79,7 +81,7 @@ int main(
   rtems_status_code     rstatus;
   rtems_id              taskid;
 
-  puts( "\n\n*** POSIX SPINLOCK TEST 01 ***" );
+  TEST_BEGIN();
 
   puts( "pthread_spin_init( NULL, PTHREAD_PROCESS_PRIVATE ) -- EINVAL" );
   status = pthread_spin_init( NULL, PTHREAD_PROCESS_PRIVATE );
@@ -222,6 +224,6 @@ int main(
   rtems_test_assert( status == 0 );
 
   /*************** END OF TEST *****************/
-  puts( "*** END OF POSIX SPINLOCK TEST 01 ***" );
+  TEST_END();
   exit(0);
 }
diff --git a/testsuites/psxtests/psxspin02/main.c b/testsuites/psxtests/psxspin02/main.c
index cc6ba26..15eb51e 100644
--- a/testsuites/psxtests/psxspin02/main.c
+++ b/testsuites/psxtests/psxspin02/main.c
@@ -43,6 +43,8 @@ rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_POSIX_SPINLOCKS 1
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 #define CONFIGURE_INIT_TASK_PRIORITY      2
diff --git a/testsuites/psxtests/psxspin02/test.c b/testsuites/psxtests/psxspin02/test.c
index 0088be9..36bcbb9 100644
--- a/testsuites/psxtests/psxspin02/test.c
+++ b/testsuites/psxtests/psxspin02/test.c
@@ -26,6 +26,8 @@
 
 #include <rtems.h>  /* for task creation */
 
+const char rtems_test_name[] = "PSXSPIN 2";
+
 /* forward declarations to avoid warnings */
 int test_main(void);
 rtems_task SpinlockThread(rtems_task_argument arg);
@@ -64,7 +66,7 @@ int main(
   rtems_status_code     rstatus;
   rtems_id              taskid;
 
-  puts( "\n\n*** POSIX SPINLOCK TEST 02 ***" );
+  TEST_BEGIN();
 
   /* This successfully creates one */
   puts( "pthread_spin_init( &Spinlock, PTHREAD_PROCESS_PRIVATE ) -- OK" );
@@ -101,6 +103,6 @@ int main(
   rtems_test_assert( status == 0 );
 
   /*************** END OF TEST *****************/
-  puts( "*** END OF POSIX SPINLOCK TEST 02 ***" );
+  TEST_END();
   exit(0);
 }
diff --git a/testsuites/psxtests/psxstack01/init.c b/testsuites/psxtests/psxstack01/init.c
index f873ccc..7a010c8 100644
--- a/testsuites/psxtests/psxstack01/init.c
+++ b/testsuites/psxtests/psxstack01/init.c
@@ -19,6 +19,8 @@
 #include <rtems/posix/pthreadimpl.h>
 #include <rtems/score/stackimpl.h>
 
+const char rtems_test_name[] = "PSXSTACK 1";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Test_Thread(void *argument);
@@ -57,7 +59,7 @@ void *POSIX_Init(
   pthread_attr_t      attr;
   struct timespec     delay_request;
 
-  puts( "\n\n*** POSIX STACK ATTRIBUTE TEST 01 ***" );
+  TEST_BEGIN();
 
   puts( "Init - Allocate stack from heap" );
   Stack_Low = malloc(PTHREAD_MINIMUM_STACK_SIZE);
@@ -84,7 +86,7 @@ void *POSIX_Init(
   sc = nanosleep( &delay_request, NULL );
   rtems_test_assert( !sc );
 
-  puts( "*** END OF POSIX STACK ATTRIBUTE TEST 01 ***" );
+  TEST_END();
   rtems_test_exit(0);
 
   return NULL; /* just so the compiler thinks we returned something */
@@ -95,6 +97,8 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        2
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psxstack02/init.c b/testsuites/psxtests/psxstack02/init.c
index 210bc7d..df65ee3 100644
--- a/testsuites/psxtests/psxstack02/init.c
+++ b/testsuites/psxtests/psxstack02/init.c
@@ -21,6 +21,8 @@
 #include <rtems/posix/pthreadimpl.h>
 #include <rtems/score/stackimpl.h>
 
+const char rtems_test_name[] = "PSXSTACK 2";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Test_Thread(void *arg);
@@ -58,7 +60,7 @@ void *POSIX_Init(void *argument)
   pthread_attr_t      attr;
   struct timespec     delay_request;
 
-  puts( "\n\n*** POSIX STACK ATTRIBUTE TEST 02  ***" );
+  TEST_BEGIN();
 
   puts( "Init - Allocate stack from heap" );
   Stack_Low = malloc(PTHREAD_MINIMUM_STACK_SIZE);
@@ -85,7 +87,7 @@ void *POSIX_Init(void *argument)
   puts( "pthread_set_stack not supported - SKIPPING TEST CASE" );
 #endif
   
-  puts( "*** END OF POSIX STACK ATTRIBUTE TEST 02  ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -95,6 +97,8 @@ void *POSIX_Init(void *argument)
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        2
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psxstat/main.c b/testsuites/psxtests/psxstat/main.c
index 42b2895..310ac3d 100644
--- a/testsuites/psxtests/psxstat/main.c
+++ b/testsuites/psxtests/psxstat/main.c
@@ -38,6 +38,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_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 
diff --git a/testsuites/psxtests/psxstat/test.c b/testsuites/psxtests/psxstat/test.c
index 9c2effe..826a394 100644
--- a/testsuites/psxtests/psxstat/test.c
+++ b/testsuites/psxtests/psxstat/test.c
@@ -37,6 +37,8 @@
 
 #include "primode.h"
 
+const char rtems_test_name[] = "PSXSTAT";
+
 /* forward declarations to avoid warnings */
 int test_main(void);
 void stat_a_file_helper(const char *file, int follow_link);
@@ -556,7 +558,6 @@ void Cause_faults(void)
    */
 
 #if 0
-  printf("\n\nPass an invalid mode to chmod should fail with EPERM \n" );
   status = chmod( Files[0], S_IFREG );
   rtems_test_assert( status == -1 );
   rtems_test_assert( errno == EPERM );
@@ -609,7 +610,6 @@ void Cause_faults(void)
    * Verify it works properly.
    */
 
-  printf( "\n\nchmod of %s to Read/Write\n", Directories[0] );
   status = chmod( Directories[0], (S_IXGRP | S_IXOTH) );
   rtems_test_assert( status == 0 );
 
@@ -820,7 +820,7 @@ int main(
   rtems_time_of_day time;
   int status;
 
-  puts( "\n\n*** STAT TEST 01 ***" );
+  TEST_BEGIN();
 
   build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
   sc = rtems_clock_set( &time );
@@ -941,6 +941,6 @@ int main(
 
   test_statvfs();
 
-  puts( "\n\n*** END OF STAT TEST 01 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtests/psxsysconf/init.c b/testsuites/psxtests/psxsysconf/init.c
index 5bc11ab..b2b9d5f 100644
--- a/testsuites/psxtests/psxsysconf/init.c
+++ b/testsuites/psxtests/psxsysconf/init.c
@@ -19,13 +19,15 @@
 #include <stdint.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXSYSCONF";
+
 void *POSIX_Init(
   void *argument
 )
 {
   long  sc;
 
-  puts( "\n\n*** POSIX TEST -- SYSCONF ***" );
+  TEST_BEGIN();
 
   puts( "sysconf -- bad configuration parameter - negative" );
   sc = sysconf( -1 );
@@ -79,7 +81,7 @@ void *POSIX_Init(
    rtems_test_exit(0);
 #endif
 
-  puts( "*** END OF POSIX TEST SYSCONF ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psxsysconf/system.h b/testsuites/psxtests/psxsysconf/system.h
index fef8cd4..ef42e03 100644
--- a/testsuites/psxtests/psxsysconf/system.h
+++ b/testsuites/psxtests/psxsysconf/system.h
@@ -26,6 +26,8 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS     2
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
diff --git a/testsuites/psxtests/psxtime/main.c b/testsuites/psxtests/psxtime/main.c
index e5a3a8f..7280e8f 100644
--- a/testsuites/psxtests/psxtime/main.c
+++ b/testsuites/psxtests/psxtime/main.c
@@ -38,6 +38,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/psxtests/psxtime/test.c b/testsuites/psxtests/psxtime/test.c
index dfdab55..58484e9 100644
--- a/testsuites/psxtests/psxtime/test.c
+++ b/testsuites/psxtests/psxtime/test.c
@@ -25,6 +25,8 @@
 #include <rtems/libio.h>
 #include <sys/time.h>
 
+const char rtems_test_name[] = "PSXTIME";
+
 #if !HAVE_DECL_ADJTIME
 extern int adjtime(const struct timeval *delta, struct timeval *olddelta);
 #endif
@@ -199,7 +201,7 @@ int main(
   int i;
   int sc;
 
-  puts( "\n\n*** POSIX TIME OF DAY TEST ***" );
+  TEST_BEGIN();
 
   puts( "gettimeofday( NULL, NULL ) - EFAULT" );
   sc = gettimeofday( NULL, NULL );
@@ -223,6 +225,6 @@ int main(
     i++;
   }
 
-  puts( "\n\n*** END OF TIME OF DAY TEST 01 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtests/psxtimer01/psxtimer.c b/testsuites/psxtests/psxtimer01/psxtimer.c
index 437d898..032e9f8 100644
--- a/testsuites/psxtests/psxtimer01/psxtimer.c
+++ b/testsuites/psxtests/psxtimer01/psxtimer.c
@@ -36,6 +36,8 @@
 #include <rtems/score/timespec.h>
 #include "pritime.h"
 
+const char rtems_test_name[] = "PSXTIMER 1";
+
 void StopTimer(
   timer_t  timer_id,
   struct   itimerspec *timerdata
@@ -341,7 +343,7 @@ void *POSIX_Init (
    struct sched_param sch_param;     /* schedule parameters */
    struct periodic_params params_a, params_b, params_c, params_c1;
 
-   puts( "\n\n*** POSIX Timers Test 01 ***" );
+   TEST_BEGIN();
 
    data.updated = FALSE;
 
@@ -455,6 +457,6 @@ void *POSIX_Init (
 
    sleep(5);
 
-   puts( "*** END OF POSIX Timers Test 01 ***" );
+   TEST_END();
    rtems_test_exit (0);
  }
diff --git a/testsuites/psxtests/psxtimer01/system.h b/testsuites/psxtests/psxtimer01/system.h
index ca6be3c..57462e7 100644
--- a/testsuites/psxtests/psxtimer01/system.h
+++ b/testsuites/psxtests/psxtimer01/system.h
@@ -39,6 +39,8 @@ void *task_c(
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS             5
 #define CONFIGURE_MAXIMUM_POSIX_TIMERS              5
 #define CONFIGURE_MAXIMUM_TIMERS                    4
diff --git a/testsuites/psxtests/psxtimer02/psxtimer.c b/testsuites/psxtests/psxtimer02/psxtimer.c
index 910deda..e4d6d7d 100644
--- a/testsuites/psxtests/psxtimer02/psxtimer.c
+++ b/testsuites/psxtests/psxtimer02/psxtimer.c
@@ -32,6 +32,8 @@
 #include <time.h>     /* time facilities */
 #include <stdio.h>    /* console facilities */
 
+const char rtems_test_name[] = "PSXTIMER 2";
+
 void *POSIX_Init (
   void *argument
 )
@@ -50,7 +52,7 @@ void *POSIX_Init (
   event.sigev_notify = SIGEV_SIGNAL;
   event.sigev_signo = SIGUSR1;
 
-  puts( "\n\n*** POSIX Timers Test 02 ***" );
+  TEST_BEGIN();
 
   puts( "timer_create - bad clock id - EINVAL" );
   status = timer_create( (timer_t) -1, &event, &timer );
@@ -125,6 +127,6 @@ void *POSIX_Init (
   status = timer_delete( timer );
   fatal_posix_service_status_errno( status, EINVAL, "bad id" );
 
-  puts( "*** END OF POSIX Timers Test 02 ***" );
+  TEST_END();
   rtems_test_exit (0);
 }
diff --git a/testsuites/psxtests/psxtimer02/system.h b/testsuites/psxtests/psxtimer02/system.h
index 5673e3b..917922d 100644
--- a/testsuites/psxtests/psxtimer02/system.h
+++ b/testsuites/psxtests/psxtimer02/system.h
@@ -26,6 +26,8 @@ void *POSIX_Init (
 
 #define CONFIGURE_POSIX_INIT_THREAD_TABLE
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS             1
 #define CONFIGURE_MAXIMUM_POSIX_TIMERS              1
 
diff --git a/testsuites/psxtests/psxtimes01/init.c b/testsuites/psxtests/psxtimes01/init.c
index 6245049..30cecd4 100644
--- a/testsuites/psxtests/psxtimes01/init.c
+++ b/testsuites/psxtests/psxtimes01/init.c
@@ -16,6 +16,8 @@
 #include <sys/times.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXTIMES 1";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 clock_t _times_r(struct _reent *ptr, struct tms  *ptms);
@@ -34,7 +36,7 @@ rtems_task Init(
   struct tms end_tm;
   int        interval = 5;
 
-  puts( "\n\n*** TEST TIMES 01 ***" );
+  TEST_BEGIN();
 
   puts( "times( NULL ) -- EFAULT" );
   sc = times( NULL );
@@ -69,7 +71,7 @@ rtems_task Init(
   rtems_test_assert( end_tm.tms_cutime == 0 );
   rtems_test_assert( end_tm.tms_cstime == 0 );
   
-  puts( "*** END OF TEST TIMES 01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
@@ -80,6 +82,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/psxtests/psxualarm/init.c b/testsuites/psxtests/psxualarm/init.c
index d7c1110..03e03b9 100644
--- a/testsuites/psxtests/psxualarm/init.c
+++ b/testsuites/psxtests/psxualarm/init.c
@@ -17,6 +17,8 @@
 #include <unistd.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXUALARM";
+
 /* forward declarations to avoid warnings */
 void Signal_handler(int signo);
 rtems_timer_service_routine Signal_duringISR_TSR(
@@ -66,7 +68,7 @@ void *POSIX_Init(
   struct sigaction  act;
   sigset_t          mask;
 
-  puts( "\n\n*** POSIX TEST UALARM ***" );
+  TEST_BEGIN();
 
   /* set the time of day, and print our buffer in multiple ways */
 
@@ -107,7 +109,7 @@ void *POSIX_Init(
   result = ualarm(0,0);
   status = sleep(10);
 
-  puts( "*** END OF POSIX TEST UALARM ***" );
+  TEST_END();
   rtems_test_exit(0);
 
   return NULL; /* just so the compiler thinks we returned something */
diff --git a/testsuites/psxtests/psxualarm/system.h b/testsuites/psxtests/psxualarm/system.h
index 932178a..fb88dd5 100644
--- a/testsuites/psxtests/psxualarm/system.h
+++ b/testsuites/psxtests/psxualarm/system.h
@@ -37,6 +37,8 @@ void *Task_3(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
 #define CONFIGURE_MAXIMUM_POSIX_THREADS        4
 #define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 5
 
diff --git a/testsuites/psxtests/psxusleep/init.c b/testsuites/psxtests/psxusleep/init.c
index 205c6c4..383943e 100644
--- a/testsuites/psxtests/psxusleep/init.c
+++ b/testsuites/psxtests/psxusleep/init.c
@@ -15,6 +15,8 @@
 #include <time.h>
 #include <errno.h>
 
+const char rtems_test_name[] = "PSXUSLEEP";
+
 /* forward declarations to avoid warnings */
 rtems_task Init(rtems_task_argument argument);
 
@@ -27,7 +29,7 @@ rtems_task Init(
   useconds_t      remaining;
   int             sc;
 
-  puts( "\n\n*** POSIX USLEEP TEST ***" );
+  TEST_BEGIN();
 
   tm_build_time( &tm, TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
 
@@ -57,7 +59,7 @@ rtems_task Init(
 
   printf( ctime( &tv.tv_sec ) );
 
-  puts( "*** END OF POSIX USLEEP TEST ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
@@ -66,6 +68,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
 




More information about the vc mailing list