psxtmtests: Add test.h support

44 files changed, 176 insertions, 88 deletions

diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c
index a7e174b392..059cd0cf82 100644
--- a/testsuites/psxtmtests/psxtmbarrier01/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier01/init.c
@@ -16,6 +16,8 @@
 #include "test_support.h"
 #include <pthread.h>
 
+const char rtems_test_name[] = "PSXTMBARRIER 01";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 static void benchmark_pthread_barrier_init(void);
@@ -71,14 +73,14 @@ void *POSIX_Init(
   void *argument
 )
 {
-  puts( "\n\n*** POSIX TIME TEST PSXTMBARRIER 01 ***" );
+  TEST_BEGIN();
 
   /* creating barrier with default properties */
   benchmark_pthread_barrier_init();
   /* destroying barrier */
   benchmark_pthread_barrier_destroy();
   
-  puts( "*** END OF POSIX TIME TEST PSXTMBARRIER 01  ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c
index 9a20d7a6f6..9952f63708 100644
--- a/testsuites/psxtmtests/psxtmbarrier02/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier02/init.c
@@ -19,6 +19,8 @@
 #include <pthread.h>
 #include <sched.h>
 
+const char rtems_test_name[] = "PSXTMBARRIER 02";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -50,7 +52,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME PSXTMBARRIER 02 ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -84,7 +86,7 @@ void *POSIX_Init(
   pthread_t  threadId;
   pthread_barrierattr_t attr;
 
-  puts( "\n\n*** POSIX TIME PSXTMBARRIER 02 ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmbarrier03/init.c b/testsuites/psxtmtests/psxtmbarrier03/init.c
index 3bfe8e3a8c..c8b4c1bea4 100644
--- a/testsuites/psxtmtests/psxtmbarrier03/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier03/init.c
@@ -19,6 +19,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMBARRIER 03";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Blocker(void *argument);
@@ -43,7 +45,7 @@ void *POSIX_Init(
   pthread_t  threadId;
   benchmark_timer_t end_time;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMBARRIER 03 ***" );
+  TEST_BEGIN();
 
   status = pthread_create( &threadId, NULL, Blocker, NULL );
   rtems_test_assert( status == 0 );
@@ -84,7 +86,7 @@ void *POSIX_Init(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMBARRIER 03 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL;
diff --git a/testsuites/psxtmtests/psxtmbarrier04/init.c b/testsuites/psxtmtests/psxtmbarrier04/init.c
index f816570b27..65fe5578c1 100644
--- a/testsuites/psxtmtests/psxtmbarrier04/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier04/init.c
@@ -17,6 +17,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMBARRIER 04";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Blocker(void *argument);
@@ -43,7 +45,7 @@ void *Blocker(
     0,
     0
   );
-  puts( "*** END OF POSIX TIME TEST PSXTMBARRIER 04 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
 }
@@ -57,7 +59,7 @@ void *POSIX_Init(
   int policy;
   struct sched_param param;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMBARRIER 04 ***" );
+  TEST_BEGIN();
 
   status = pthread_create( &threadId, NULL, Blocker, NULL );
   rtems_test_assert( status == 0 );
diff --git a/testsuites/psxtmtests/psxtmcond01/init.c b/testsuites/psxtmtests/psxtmcond01/init.c
index 2996104d5b..7f1f820be1 100644
--- a/testsuites/psxtmtests/psxtmcond01/init.c
+++ b/testsuites/psxtmtests/psxtmcond01/init.c
@@ -19,6 +19,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMCOND 01";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void benchmark_create_cond_var(void);
@@ -68,12 +70,12 @@ void *POSIX_Init(
   void *argument
 )
 {
-  puts( "\n\n*** POSIX TIME TEST PSXTMCOND01 ***" );
+  TEST_BEGIN();
 
   benchmark_create_cond_var();
   benchmark_destroy_cond_var();
 
-  puts( "*** END OF POSIX TIME TEST PSXTMCOND01 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/psxtmtests/psxtmcond02/init.c b/testsuites/psxtmtests/psxtmcond02/init.c
index 9a7ef99de5..7621517fb7 100644
--- a/testsuites/psxtmtests/psxtmcond02/init.c
+++ b/testsuites/psxtmtests/psxtmcond02/init.c
@@ -16,6 +16,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMCOND 02";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void benchmark_signal(void);
@@ -48,13 +50,13 @@ void *POSIX_Init(
   void *argument
 )
 {  
-  puts( "\n\n*** POSIX TIME TEST PSXTMCOND02 ***" );
+  TEST_BEGIN();
 
   pthread_cond_init(&CondID, NULL);
 
   benchmark_signal();
 
-  puts( "*** END OF POSIX TIME TEST PSXTMCOND02 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/psxtmtests/psxtmcond03/init.c b/testsuites/psxtmtests/psxtmcond03/init.c
index 22806d0841..f901878578 100644
--- a/testsuites/psxtmtests/psxtmcond03/init.c
+++ b/testsuites/psxtmtests/psxtmcond03/init.c
@@ -19,6 +19,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMCOND 03";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Blocker(void *argument);
@@ -54,7 +56,7 @@ void *POSIX_Init(
   struct sched_param param;
   int policy;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMCOND03 ***" );
+  TEST_BEGIN();
 
   status = pthread_create( &threadId, NULL, Blocker, NULL );
   rtems_test_assert( status == 0 );
@@ -92,7 +94,7 @@ void *POSIX_Init(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMCOND03 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL;
diff --git a/testsuites/psxtmtests/psxtmcond04/init.c b/testsuites/psxtmtests/psxtmcond04/init.c
index e300e9edc4..eb2823082e 100644
--- a/testsuites/psxtmtests/psxtmcond04/init.c
+++ b/testsuites/psxtmtests/psxtmcond04/init.c
@@ -19,6 +19,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMCOND 04";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Blocker(void *argument);
@@ -54,7 +56,7 @@ void *Blocker(
     0,
     0
   );
-  puts( "*** END OF POSIX TIME TEST PSXTMCOND04 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
   return NULL;
 }
@@ -66,7 +68,7 @@ void *POSIX_Init(
   int        status;
   pthread_t  threadId;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMCOND04 ***" );
+  TEST_BEGIN();
 
   status = pthread_create( &threadId, NULL, Blocker, NULL );
   rtems_test_assert( status == 0 );
diff --git a/testsuites/psxtmtests/psxtmcond05/init.c b/testsuites/psxtmtests/psxtmcond05/init.c
index 2692c0a6ce..1e74c21bc2 100644
--- a/testsuites/psxtmtests/psxtmcond05/init.c
+++ b/testsuites/psxtmtests/psxtmcond05/init.c
@@ -16,6 +16,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMCOND 05";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void benchmark_broadcast(void);
@@ -47,13 +49,13 @@ void *POSIX_Init(
 )
 {
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMCOND05 ***" );
+  TEST_BEGIN();
 
   pthread_cond_init(&CondID, NULL);
 
   benchmark_broadcast();
 
-  puts( "*** END OF POSIX TIME TEST PSXTMCOND05 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/psxtmtests/psxtmcond06/init.c b/testsuites/psxtmtests/psxtmcond06/init.c
index 082a751b6b..371792640f 100644
--- a/testsuites/psxtmtests/psxtmcond06/init.c
+++ b/testsuites/psxtmtests/psxtmcond06/init.c
@@ -21,6 +21,8 @@
 
 #define N 5
 
+const char rtems_test_name[] = "PSXTMCOND 06";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Blocker(void *argument);
@@ -58,7 +60,7 @@ void *POSIX_Init(
   struct sched_param  param;
   int                 policy;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMCOND06 ***" );
+  TEST_BEGIN();
 
   /* Setup variables */
   status = pthread_create( &threadId, NULL, Blocker, NULL );
@@ -109,7 +111,7 @@ void *POSIX_Init(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMCOND06 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL;
diff --git a/testsuites/psxtmtests/psxtmcond07/init.c b/testsuites/psxtmtests/psxtmcond07/init.c
index b466a86166..11d2912c6d 100644
--- a/testsuites/psxtmtests/psxtmcond07/init.c
+++ b/testsuites/psxtmtests/psxtmcond07/init.c
@@ -21,6 +21,8 @@
 
 #define N 1
 
+const char rtems_test_name[] = "PSXTMCOND 07";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Blocker(void *argument);
@@ -50,7 +52,7 @@ void *Blocker(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMCOND07 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
   return NULL;
 
@@ -66,7 +68,7 @@ void *POSIX_Init(
   pthread_attr_t      attr;
   struct sched_param  param;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMCOND07 ***" );
+  TEST_BEGIN();
 
   /* Setup variables */
   status = pthread_create( &threadId, NULL, Blocker, NULL );
diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c
index 38551eacc9..3da351c266 100644
--- a/testsuites/psxtmtests/psxtmcond08/init.c
+++ b/testsuites/psxtmtests/psxtmcond08/init.c
@@ -35,6 +35,8 @@
 
 #include <pthread.h>
 
+const char rtems_test_name[] = "PSXTMCOND 08";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -60,7 +62,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMCOND" TEST_NUMBER " ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -123,7 +125,7 @@ void *POSIX_Init(
   int             rc;
   struct timeval  tp;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMCOND" TEST_NUMBER " ***" );
+  TEST_BEGIN();
 
   rc =  gettimeofday(&tp, NULL);
   rtems_test_assert( rc == 0 );
diff --git a/testsuites/psxtmtests/psxtmkey01/init.c b/testsuites/psxtmtests/psxtmkey01/init.c
index 31f7518ee5..4b3681e03e 100644
--- a/testsuites/psxtmtests/psxtmkey01/init.c
+++ b/testsuites/psxtmtests/psxtmkey01/init.c
@@ -17,6 +17,8 @@
 #include <pthread.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMKEY 01";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -65,7 +67,7 @@ static void benchmark_pthread_key_delete(void)
 void *POSIX_Init(void *argument)
 {
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMKEY01 ***" );
+  TEST_BEGIN();
 
   /*key creation, using NULL destructor*/
   benchmark_pthread_key_create();
@@ -73,7 +75,7 @@ void *POSIX_Init(void *argument)
   /* key deletion*/
   benchmark_pthread_key_delete();
   
-  puts( "*** END OF POSIX TIME TEST PSXTMKEY01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtmtests/psxtmkey02/init.c b/testsuites/psxtmtests/psxtmkey02/init.c
index 2f41c10f25..4814ef00da 100644
--- a/testsuites/psxtmtests/psxtmkey02/init.c
+++ b/testsuites/psxtmtests/psxtmkey02/init.c
@@ -17,6 +17,8 @@
 #include <pthread.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMKEY 02";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void benchmark_pthread_setspecific(void *value_p);
@@ -70,7 +72,7 @@ void *POSIX_Init(
 {
   int  status;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMKEY02 ***" );
+  TEST_BEGIN();
 
   /* create the key */
   status = pthread_key_create( &Key, NULL );
@@ -84,7 +86,7 @@ void *POSIX_Init(
   status = pthread_key_delete( Key );
   rtems_test_assert( status == 0 );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMKEY02 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/psxtmtests/psxtmmq01/init.c b/testsuites/psxtmtests/psxtmmq01/init.c
index d2644f9b54..ca80374899 100644
--- a/testsuites/psxtmtests/psxtmmq01/init.c
+++ b/testsuites/psxtmtests/psxtmmq01/init.c
@@ -19,6 +19,8 @@
 #include <mqueue.h>
 #include <signal.h>   /* signal facilities */
 
+const char rtems_test_name[] = "PSXTMMQ 01";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -256,7 +258,7 @@ void *POSIX_Init(
   void *argument
 )
 {
-  puts( "\n\n*** POSIX TIME TEST PSXTMMQ01 ***" );
+  TEST_BEGIN();
   /* create the first message queue READWRITE */
   benchmark_mq_open(1);
   /* send message using first queue */
@@ -287,7 +289,7 @@ void *POSIX_Init(
   /* closing the first queue */
   benchmark_mq_close(1);
 
-  puts( "*** END OF POSIX TIME TEST PSXTMMQ01 ***" );
+ TEST_END();
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/psxtmtests/psxtmmutex01/init.c b/testsuites/psxtmtests/psxtmmutex01/init.c
index ed1729bcd2..8a72bf9d5c 100644
--- a/testsuites/psxtmtests/psxtmmutex01/init.c
+++ b/testsuites/psxtmtests/psxtmmutex01/init.c
@@ -17,6 +17,8 @@
 #include <pthread.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMMUTEX 01";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -65,12 +67,12 @@ void *POSIX_Init(
 )
 {
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX01 ***" );
+  TEST_BEGIN();
 
   test_mutex_create();
   test_mutex_destroy();
 
-  puts( "*** END OF POSIX TIME TEST PSXTMMUTEX01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c
index ec0b658a30..b82d23d1dd 100644
--- a/testsuites/psxtmtests/psxtmmutex02/init.c
+++ b/testsuites/psxtmtests/psxtmmutex02/init.c
@@ -19,6 +19,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMMUTEX 02";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -50,7 +52,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMMUTEX02 ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -84,7 +86,7 @@ void *POSIX_Init(
   int        status;
   pthread_t  threadId;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX02 ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmmutex03/init.c b/testsuites/psxtmtests/psxtmmutex03/init.c
index 6e6c86a4ae..07f49a5b54 100644
--- a/testsuites/psxtmtests/psxtmmutex03/init.c
+++ b/testsuites/psxtmtests/psxtmmutex03/init.c
@@ -17,6 +17,8 @@
 #include <pthread.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMMUTEX 03";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void benchmark_mutex_lock_available(void);
@@ -133,7 +135,7 @@ void *POSIX_Init(
 {
   int  status;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX03 ***" );
+  TEST_BEGIN();
   
   /*
    * Create the single Mutex used in all the test case
@@ -160,7 +162,7 @@ void *POSIX_Init(
   status = pthread_mutex_destroy( &MutexId );
   rtems_test_assert( !status );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMMUTEX03 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtmtests/psxtmmutex04/init.c b/testsuites/psxtmtests/psxtmmutex04/init.c
index 6ccf07dbe0..a1a8aa2dcd 100644
--- a/testsuites/psxtmtests/psxtmmutex04/init.c
+++ b/testsuites/psxtmtests/psxtmmutex04/init.c
@@ -19,6 +19,8 @@
 #include <pthread.h>
 #include <sched.h>
 
+const char rtems_test_name[] = "PSXTMMUTEX 04";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -50,7 +52,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMMUTEX04 ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -84,7 +86,7 @@ void *POSIX_Init(
   int        status;
   pthread_t  threadId;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX04 ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmmutex05/init.c b/testsuites/psxtmtests/psxtmmutex05/init.c
index 0ce8d39f7e..d36e5340ab 100644
--- a/testsuites/psxtmtests/psxtmmutex05/init.c
+++ b/testsuites/psxtmtests/psxtmmutex05/init.c
@@ -19,6 +19,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMMUTEX 05";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Blocker(void *argument);
@@ -44,7 +46,7 @@ void *POSIX_Init(
   pthread_t  threadId;
   benchmark_timer_t end_time;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX05 ***" );
+  TEST_BEGIN();
 
   status = pthread_create( &threadId, NULL, Blocker, NULL );
   rtems_test_assert( status == 0 );
@@ -82,7 +84,7 @@ void *POSIX_Init(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMMUTEX05 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL;
diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c
index c6eb3cf988..047f06336b 100644
--- a/testsuites/psxtmtests/psxtmmutex06/init.c
+++ b/testsuites/psxtmtests/psxtmmutex06/init.c
@@ -19,6 +19,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMMUTEX 06";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -46,7 +48,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMMUTEX07 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
   return NULL;
 }
@@ -80,7 +82,7 @@ void *POSIX_Init(
   pthread_attr_t      attr;
   struct sched_param  param;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX02 ***" );
+  TEST_BEGIN();
 
   /*
    * Deliberately create the mutex BEFORE the threads.  This way the
diff --git a/testsuites/psxtmtests/psxtmmutex07/init.c b/testsuites/psxtmtests/psxtmmutex07/init.c
index 278b197de5..adee9945ec 100644
--- a/testsuites/psxtmtests/psxtmmutex07/init.c
+++ b/testsuites/psxtmtests/psxtmmutex07/init.c
@@ -17,6 +17,8 @@
 #include <pthread.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMMUTEX 07";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void test_mutex_setprioceiling(void);
@@ -70,7 +72,7 @@ void *POSIX_Init(
 {
   int  status;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX07 ***" );
+  TEST_BEGIN();
   /* create mutex*/
   status = pthread_mutex_init( &MutexId, NULL );
   rtems_test_assert( status == 0 );
@@ -83,7 +85,7 @@ void *POSIX_Init(
   status = pthread_mutex_destroy( &MutexId );
   rtems_test_assert( status == 0 );
   
-  puts( "*** END OF POSIX TIME TEST PSXTMMUTEX07 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtmtests/psxtmnanosleep01/init.c b/testsuites/psxtmtests/psxtmnanosleep01/init.c
index 99d9551fd6..e86a5d1086 100644
--- a/testsuites/psxtmtests/psxtmnanosleep01/init.c
+++ b/testsuites/psxtmtests/psxtmnanosleep01/init.c
@@ -15,6 +15,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMNANOSLEEP 01";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -28,7 +30,7 @@ void *POSIX_Init(
   sleepTime.tv_sec = 0;
   sleepTime.tv_nsec = 0;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMNANOSLEEP01 ***" );
+  TEST_BEGIN();
 
   benchmark_timer_initialize();    
     nanosleep( &sleepTime, (struct  timespec *) NULL );
@@ -36,7 +38,7 @@ void *POSIX_Init(
 
   put_time( "nanosleep: yield", end_time, 1, 0, 0 );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMNANOSLEEP01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtmtests/psxtmnanosleep02/init.c b/testsuites/psxtmtests/psxtmnanosleep02/init.c
index 022fc56909..f932811018 100644
--- a/testsuites/psxtmtests/psxtmnanosleep02/init.c
+++ b/testsuites/psxtmtests/psxtmnanosleep02/init.c
@@ -17,6 +17,8 @@
 
 #include <pthread.h>
 
+const char rtems_test_name[] = "PSXTMNANOSLEEP 02";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -38,7 +40,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMNANOSLEEP02 ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -73,7 +75,7 @@ void *POSIX_Init(
   remainder.tv_sec = 0;
   remainder.tv_nsec = 0;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMNANOSLEEP02 ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmrwlock01/init.c b/testsuites/psxtmtests/psxtmrwlock01/init.c
index b9adf2d4b8..2f99a1995b 100644
--- a/testsuites/psxtmtests/psxtmrwlock01/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock01/init.c
@@ -16,6 +16,8 @@
 #include <pthread.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMRWLOCK 01";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -223,7 +225,7 @@ void *POSIX_Init(
 )
 {
 
-  puts( "\n\n*** POSIX TIME PSXTMRWLOCK 01  ***" );
+  TEST_BEGIN();
 
   /* initializing rwlock */
   benchmark_pthread_rwlock_init();
@@ -258,7 +260,7 @@ void *POSIX_Init(
   /* destroying rwlock */
   benchmark_pthread_rwlock_destroy();
 
-  puts( "*** END OF POSIX TIME PSXTMRWLOCK 01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtmtests/psxtmrwlock02/init.c b/testsuites/psxtmtests/psxtmrwlock02/init.c
index 2f198a5b03..1017c7ca7f 100644
--- a/testsuites/psxtmtests/psxtmrwlock02/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock02/init.c
@@ -19,6 +19,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMRWLOCK 02";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -50,7 +52,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME PSXTMRWLOCK 02 TEST ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -85,7 +87,7 @@ void *POSIX_Init(
   pthread_t  threadId;
   pthread_rwlockattr_t attr;
 
-  puts( "\n\n*** POSIX TIME PSXTMRWLOCK 02 TEST ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmrwlock03/init.c b/testsuites/psxtmtests/psxtmrwlock03/init.c
index 25256d4546..76b5db2438 100644
--- a/testsuites/psxtmtests/psxtmrwlock03/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock03/init.c
@@ -19,6 +19,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMRWLOCK 03";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -51,7 +53,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME PSXTMRWLOCK 03 TEST ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -87,7 +89,7 @@ void *POSIX_Init(
   pthread_t  threadId;
   pthread_rwlockattr_t attr;
 
-  puts( "\n\n*** POSIX TIME PSXTMRWLOCK 03 TEST ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmrwlock04/init.c b/testsuites/psxtmtests/psxtmrwlock04/init.c
index f2aacbd02b..1eb2236d14 100644
--- a/testsuites/psxtmtests/psxtmrwlock04/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock04/init.c
@@ -19,6 +19,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMRWLOCK 04";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -50,7 +52,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME PSXTMRWLOCK 04 TEST ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -86,7 +88,7 @@ void *POSIX_Init(
   pthread_t  threadId;
   pthread_rwlockattr_t attr;
 
-  puts( "\n\n*** POSIX TIME PSXTMRWLOCK 04 TEST ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmrwlock05/init.c b/testsuites/psxtmtests/psxtmrwlock05/init.c
index 01696b8ae6..95d0fd9f90 100644
--- a/testsuites/psxtmtests/psxtmrwlock05/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock05/init.c
@@ -19,6 +19,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMRWLOCK 05";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -51,7 +53,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME PSXTMRWLOCK 05 TEST ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -88,7 +90,7 @@ void *POSIX_Init(
   pthread_t  threadId;
   pthread_rwlockattr_t attr;
 
-  puts( "\n\n*** POSIX TIME PSXTMRWLOCK 05 TEST ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmrwlock06/init.c b/testsuites/psxtmtests/psxtmrwlock06/init.c
index 572aa33696..b83bfdd7f3 100644
--- a/testsuites/psxtmtests/psxtmrwlock06/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock06/init.c
@@ -19,6 +19,8 @@
 #include "test_support.h"
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMRWLOCK 06";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Blocker(void *argument);
@@ -45,7 +47,7 @@ void *POSIX_Init(
   benchmark_timer_t end_time;
   pthread_rwlockattr_t  attr;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMRWLOCK 06 ***" );
+  TEST_BEGIN();
 
   status = pthread_create( &threadId, NULL, Blocker, NULL );
   rtems_test_assert( status == 0 );
@@ -87,7 +89,7 @@ void *POSIX_Init(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMRWLOCK 06 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL;
diff --git a/testsuites/psxtmtests/psxtmrwlock07/init.c b/testsuites/psxtmtests/psxtmrwlock07/init.c
index a22e03dff9..25067555fd 100644
--- a/testsuites/psxtmtests/psxtmrwlock07/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock07/init.c
@@ -19,6 +19,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMRWLOCK 07";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -47,7 +49,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMRWLOCK 07 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
   return NULL;
 }
@@ -84,7 +86,7 @@ void *POSIX_Init(
   struct sched_param  param;
   pthread_rwlockattr_t rw_attr;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMRWLOCK 07 ***" );
+  TEST_BEGIN();
 
   /*
    * Deliberately create the lock BEFORE the threads.  This way the
diff --git a/testsuites/psxtmtests/psxtmsem01/init.c b/testsuites/psxtmtests/psxtmsem01/init.c
index af4cca731a..10a77307ec 100644
--- a/testsuites/psxtmtests/psxtmsem01/init.c
+++ b/testsuites/psxtmtests/psxtmsem01/init.c
@@ -19,6 +19,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMSEM 01";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -164,7 +166,7 @@ static void benchmark_sem_close_second(void)
 void *POSIX_Init(void *argument)
 {
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMSEM01 ***" );
+  TEST_BEGIN();
 
   /* creating unnamed semaphore */
   benchmark_sem_init();
@@ -187,7 +189,7 @@ void *POSIX_Init(void *argument)
   benchmark_sem_close(false);
   benchmark_sem_unlink("sem_unlink: deletes semaphore");
 
-  puts( "*** END OF POSIX TIME TEST PSXTMSEM01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtmtests/psxtmsem02/init.c b/testsuites/psxtmtests/psxtmsem02/init.c
index 979b8b5c9b..70871ec280 100644
--- a/testsuites/psxtmtests/psxtmsem02/init.c
+++ b/testsuites/psxtmtests/psxtmsem02/init.c
@@ -19,6 +19,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMSEM 02";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -125,7 +127,7 @@ static void benchmark_sem_trywait_not_available(void)
 void *POSIX_Init(void *argument)
 {
   int status;
-  puts( "\n\n*** POSIX TIME TEST PSXTMSEM02 ***" );
+  TEST_BEGIN();
 
   /* create the semaphore */
   status = sem_init( &sem1, 0, 1 );
@@ -142,7 +144,7 @@ void *POSIX_Init(void *argument)
   /* try to lock the semaphore, not available */
   benchmark_sem_trywait_not_available();
 
-  puts( "*** END OF POSIX TIME TEST PSXTMSEM02 ***" );
+  TEST_END();
 
   /*Destroying the semaphore*/
   status = sem_destroy(&sem1);
diff --git a/testsuites/psxtmtests/psxtmsem03/init.c b/testsuites/psxtmtests/psxtmsem03/init.c
index 2fb91c0d19..828a053883 100644
--- a/testsuites/psxtmtests/psxtmsem03/init.c
+++ b/testsuites/psxtmtests/psxtmsem03/init.c
@@ -21,6 +21,8 @@
 #include <pthread.h>
 #include <sched.h>
 
+const char rtems_test_name[] = "PSXTMSEM 03";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -54,7 +56,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMSEM03 ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -85,7 +87,7 @@ void *POSIX_Init(
   int        status;
   pthread_t  threadId;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMSEM03 ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmsem04/init.c b/testsuites/psxtmtests/psxtmsem04/init.c
index e13f075380..64cbc332c8 100644
--- a/testsuites/psxtmtests/psxtmsem04/init.c
+++ b/testsuites/psxtmtests/psxtmsem04/init.c
@@ -22,6 +22,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMSEM 04";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Blocker(void *argument);
@@ -46,7 +48,7 @@ void *POSIX_Init(void *argument)
   pthread_t  threadId;
   benchmark_timer_t end_time;
 
-  puts( "\n\n*** POSIX TIME TEST SEMAPHORE 04 ***" );
+  TEST_BEGIN();
 
   status = pthread_create( &threadId, NULL, Blocker, NULL );
   rtems_test_assert( status == 0 );
@@ -85,7 +87,7 @@ void *POSIX_Init(void *argument)
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST SEMAPHORE 04 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 
   return NULL;
diff --git a/testsuites/psxtmtests/psxtmsem05/init.c b/testsuites/psxtmtests/psxtmsem05/init.c
index 134e99e583..fd1585db6e 100644
--- a/testsuites/psxtmtests/psxtmsem05/init.c
+++ b/testsuites/psxtmtests/psxtmsem05/init.c
@@ -22,6 +22,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMSEM 05";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -51,7 +53,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMSEM05 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
   return NULL;
 }
@@ -87,7 +89,7 @@ void *POSIX_Init(
   pthread_attr_t      attr;
   struct sched_param  param;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMSEM05  ***" );
+  TEST_BEGIN();
 
   /*
    * Deliberately create the semaphore BEFORE the threads.  This way the
diff --git a/testsuites/psxtmtests/psxtmsleep01/init.c b/testsuites/psxtmtests/psxtmsleep01/init.c
index 7514e3f94a..68a2e23902 100644
--- a/testsuites/psxtmtests/psxtmsleep01/init.c
+++ b/testsuites/psxtmtests/psxtmsleep01/init.c
@@ -17,6 +17,8 @@
 
 #include <unistd.h>
 
+const char rtems_test_name[] = "PSXTMSLEEP 01";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 
@@ -26,7 +28,7 @@ void *POSIX_Init(
 {
   benchmark_timer_t end_time;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMSLEEP01 ***" );
+  TEST_BEGIN();
 
   benchmark_timer_initialize();
     sleep(0);
@@ -40,7 +42,7 @@ void *POSIX_Init(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMSLEEP01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtmtests/psxtmsleep02/init.c b/testsuites/psxtmtests/psxtmsleep02/init.c
index 3db468a8dc..9889175308 100644
--- a/testsuites/psxtmtests/psxtmsleep02/init.c
+++ b/testsuites/psxtmtests/psxtmsleep02/init.c
@@ -17,6 +17,8 @@
 
 #include <pthread.h>
 
+const char rtems_test_name[] = "PSXTMSLEEP 02";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -38,7 +40,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMSLEEP02 ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
   return NULL;
@@ -60,7 +62,7 @@ void *POSIX_Init(
   int        status;
   pthread_t  threadId;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMSLEEP02 ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmthread01/init.c b/testsuites/psxtmtests/psxtmthread01/init.c
index d83c8e8808..60f94cfa56 100644
--- a/testsuites/psxtmtests/psxtmthread01/init.c
+++ b/testsuites/psxtmtests/psxtmthread01/init.c
@@ -18,6 +18,8 @@
 
 #include <pthread.h>
 
+const char rtems_test_name[] = "PSXTMTHREAD 01";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *TestThread(void *argument);
@@ -47,7 +49,7 @@ void *POSIX_Init(
   void *argument
 )
 {
-  puts( "\n\n*** POSIX TIME TEST PSXTMTHREAD01 ***" );
+  TEST_BEGIN();
 
   rtems_time_test_measure_operation(
     "pthread_create: no preempt",
@@ -58,7 +60,7 @@ void *POSIX_Init(
   );
 
   
-  puts( "*** END OF POSIX TIME TEST PSXTMTHREAD01 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/psxtmtests/psxtmthread02/init.c b/testsuites/psxtmtests/psxtmthread02/init.c
index efaceb608c..4357938ad2 100644
--- a/testsuites/psxtmtests/psxtmthread02/init.c
+++ b/testsuites/psxtmtests/psxtmthread02/init.c
@@ -17,6 +17,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMTHREAD 02";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void benchmark_pthread_create(void);
@@ -69,11 +71,11 @@ void *POSIX_Init(
 )
 {
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMTHREAD02 ***" );
+  TEST_BEGIN();
 
   benchmark_pthread_create();
 
-  puts( "*** END OF POSIX TIME TEST PSXTMTHREAD02 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/psxtmtests/psxtmthread03/init.c b/testsuites/psxtmtests/psxtmthread03/init.c
index da636ae68c..23acdd071e 100644
--- a/testsuites/psxtmtests/psxtmthread03/init.c
+++ b/testsuites/psxtmtests/psxtmthread03/init.c
@@ -19,6 +19,8 @@
 #include <sched.h>
 #include <rtems/timerdrv.h>
 
+const char rtems_test_name[] = "PSXTMTHREAD 03";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void *Middle(void *argument);
@@ -48,7 +50,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMTHREAD03 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
   return NULL;
 }
@@ -77,7 +79,7 @@ void *POSIX_Init(
   int        status;
   pthread_t  threadId;
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMTHREAD03 ***" );
+  TEST_BEGIN();
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/testsuites/psxtmtests/psxtmthread04/init.c b/testsuites/psxtmtests/psxtmthread04/init.c
index a2de986406..28e1833a8a 100644
--- a/testsuites/psxtmtests/psxtmthread04/init.c
+++ b/testsuites/psxtmtests/psxtmthread04/init.c
@@ -17,6 +17,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMTHREAD 04";
+
 /* forward declarations to avoid warnings */
 void benchmark_pthread_setschedparam(void);
 void benchmark_pthread_getschedparam(void);
@@ -75,12 +77,12 @@ void *POSIX_Init(
 )
 {
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMTHREAD04 ***" );
+  TEST_BEGIN();
 
   benchmark_pthread_getschedparam();
   benchmark_pthread_setschedparam();
 
-  puts( "*** END OF POSIX TIME TEST PSXTMTHREAD04 ***" );
+  TEST_END();
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/psxtmtests/psxtmthread05/init.c b/testsuites/psxtmtests/psxtmthread05/init.c
index 7b26b7b536..98346b6be6 100644
--- a/testsuites/psxtmtests/psxtmthread05/init.c
+++ b/testsuites/psxtmtests/psxtmthread05/init.c
@@ -18,6 +18,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMTHREAD 05";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void benchmark_pthread_create(void);
@@ -64,7 +66,7 @@ void *test_thread(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMTHREAD05 ***" );
+  TEST_END();
   rtems_test_exit(0);
   //Empty thread used in pthread_create().
   return NULL;
@@ -75,7 +77,7 @@ void *POSIX_Init(
 )
 {
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMTHREAD05 ***" );
+  TEST_BEGIN();
   benchmark_pthread_setschedparam();
 
   rtems_test_assert( 1 );
diff --git a/testsuites/psxtmtests/psxtmthread06/init.c b/testsuites/psxtmtests/psxtmthread06/init.c
index b0e30338d5..0a7ee34eeb 100644
--- a/testsuites/psxtmtests/psxtmthread06/init.c
+++ b/testsuites/psxtmtests/psxtmthread06/init.c
@@ -19,6 +19,8 @@
 #include <rtems/timerdrv.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "PSXTMTHREAD 06";
+
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
 void benchmark_pthread_create(void);
@@ -66,7 +68,7 @@ void *test_thread(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST PSXTMTHREAD06 ***" );
+  TEST_END();
   rtems_test_exit(0);
   //Empty thread used in pthread_create().
   return NULL;
@@ -77,7 +79,7 @@ void *POSIX_Init(
 )
 {
 
-  puts( "\n\n*** POSIX TIME TEST PSXTMTHREAD06 ***" );
+  TEST_BEGIN();
   benchmark_pthread_setschedparam();
 
   rtems_test_assert( 1 );