From 2ead50ac4e29d0082dd1f833771a01bb2b642636 Mon Sep 17 00:00:00 2001
From: bjorn larsson <bjornlarsson@oarcorp.com>
Date: Fri, 21 Mar 2014 10:48:01 -0500
Subject: tmtests: convert to test.h

---
 testsuites/tmtests/tm01/task1.c        | 6 ++++--
 testsuites/tmtests/tm02/task1.c        | 6 ++++--
 testsuites/tmtests/tm03/task1.c        | 6 ++++--
 testsuites/tmtests/tm04/task1.c        | 6 ++++--
 testsuites/tmtests/tm05/task1.c        | 6 ++++--
 testsuites/tmtests/tm06/task1.c        | 6 ++++--
 testsuites/tmtests/tm07/task1.c        | 6 ++++--
 testsuites/tmtests/tm08/task1.c        | 6 ++++--
 testsuites/tmtests/tm09/task1.c        | 6 ++++--
 testsuites/tmtests/tm10/task1.c        | 6 ++++--
 testsuites/tmtests/tm11/task1.c        | 6 ++++--
 testsuites/tmtests/tm12/task1.c        | 6 ++++--
 testsuites/tmtests/tm13/task1.c        | 6 ++++--
 testsuites/tmtests/tm14/task1.c        | 6 ++++--
 testsuites/tmtests/tm15/task1.c        | 6 ++++--
 testsuites/tmtests/tm16/task1.c        | 6 ++++--
 testsuites/tmtests/tm17/task1.c        | 6 ++++--
 testsuites/tmtests/tm18/task1.c        | 6 ++++--
 testsuites/tmtests/tm19/task1.c        | 6 ++++--
 testsuites/tmtests/tm20/task1.c        | 6 ++++--
 testsuites/tmtests/tm21/task1.c        | 6 ++++--
 testsuites/tmtests/tm22/task1.c        | 6 ++++--
 testsuites/tmtests/tm23/task1.c        | 6 ++++--
 testsuites/tmtests/tm24/task1.c        | 6 ++++--
 testsuites/tmtests/tm25/task1.c        | 6 ++++--
 testsuites/tmtests/tm26/task1.c        | 8 +++++---
 testsuites/tmtests/tm27/task1.c        | 8 +++++---
 testsuites/tmtests/tm28/task1.c        | 6 ++++--
 testsuites/tmtests/tm29/task1.c        | 6 ++++--
 testsuites/tmtests/tm30/init.c         | 6 ++++--
 testsuites/tmtests/tmck/task1.c        | 6 ++++--
 testsuites/tmtests/tmcontext01/init.c  | 2 ++
 testsuites/tmtests/tmoverhd/testtask.c | 6 ++++--
 33 files changed, 132 insertions(+), 66 deletions(-)

diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
index 028cb29707..98f9f053f2 100644
--- a/testsuites/tmtests/tm01/task1.c
+++ b/testsuites/tmtests/tm01/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST";
+
 rtems_task Test_task(
   rtems_task_argument argument
 );
@@ -26,7 +28,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 1 ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
@@ -185,6 +187,6 @@ rtems_task Test_task(
     CALLING_OVERHEAD_SEMAPHORE_RELEASE
   );
 
-  puts( "*** END OF TEST 1 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
index bae5a1a094..e27e4a0188 100644
--- a/testsuites/tmtests/tm02/task1.c
+++ b/testsuites/tmtests/tm02/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 2";
+
 rtems_id High_id;
 rtems_id Low_id;
 rtems_id Semaphore_id;
@@ -42,7 +44,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 2 ***" );
+  TEST_BEGIN();
 
   test_init();
 
@@ -154,6 +156,6 @@ rtems_task Low_task(
     CALLING_OVERHEAD_SEMAPHORE_OBTAIN
   );
 
-  puts( "*** END OF TEST 2 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
index 24b34396da..9cd8de8cdb 100644
--- a/testsuites/tmtests/tm03/task1.c
+++ b/testsuites/tmtests/tm03/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 3";
+
 rtems_id Semaphore_id;
 rtems_task test_init(
   rtems_task_argument argument
@@ -38,7 +40,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 3 ***" );
+  TEST_BEGIN();
   status = rtems_task_create(
     rtems_build_name( 'T', 'A', '1', ' ' ),
     RTEMS_MAXIMUM_PRIORITY - 1u,
@@ -145,6 +147,6 @@ rtems_task High_task(
     CALLING_OVERHEAD_SEMAPHORE_RELEASE
   );
 
-  puts( "*** END OF TEST 3 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
index 3e4a151a89..9701e739d9 100644
--- a/testsuites/tmtests/tm04/task1.c
+++ b/testsuites/tmtests/tm04/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 4";
+
 rtems_id         Semaphore_id;
 rtems_id         Task_id[OPERATION_COUNT+1];
 uint32_t         task_count;
@@ -45,7 +47,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 4 ***" );
+  TEST_BEGIN();
 
   test_init();
 
@@ -331,7 +333,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_TASK_DELETE
   );
 
-  puts( "*** END OF TEST 4 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
index 1a01f58895..d1485e25bd 100644
--- a/testsuites/tmtests/tm05/task1.c
+++ b/testsuites/tmtests/tm05/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 5";
+
 rtems_id   Task_id[OPERATION_COUNT+1];
 uint32_t   Task_index;
 
@@ -41,7 +43,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 5 ***" );
+  TEST_BEGIN();
 
   test_init();
 
@@ -102,7 +104,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_TASK_RESUME
   );
 
-  puts( "*** END OF TEST 5 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
index 336329280e..a784f9cfac 100644
--- a/testsuites/tmtests/tm06/task1.c
+++ b/testsuites/tmtests/tm06/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 6";
+
 rtems_id Task_id[ OPERATION_COUNT + 1 ];
 
 uint32_t   Task_restarted;
@@ -36,7 +38,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 6 ***" );
+  TEST_BEGIN();
 
   test_init();
 
@@ -149,7 +151,7 @@ rtems_task Task_1(
     CALLING_OVERHEAD_TASK_RESUME
   );
 
-  puts( "*** END OF TEST 6 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
index b24716817d..a14f1a8f23 100644
--- a/testsuites/tmtests/tm07/task1.c
+++ b/testsuites/tmtests/tm07/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 7";
+
 rtems_id Task_id[ OPERATION_COUNT+1 ], task_index;
 
 rtems_task High_task(
@@ -40,7 +42,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 7 ***" );
+  TEST_BEGIN();
 
   test_init();
 
@@ -98,7 +100,7 @@ rtems_task High_task(
   } else
     (void) rtems_task_suspend( RTEMS_SELF );
 
-  puts( "*** END OF TEST 7 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index 0f255fbb27..f26931f627 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 8";
+
 rtems_id Test_task_id;
 
 rtems_task test_task(
@@ -32,7 +34,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 8 ***" );
+  TEST_BEGIN();
 
   test_init();
 
@@ -238,7 +240,7 @@ rtems_task test_task(
     CALLING_OVERHEAD_CLOCK_GET
   );
 
-  puts( "*** END OF TEST 8 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index d231da4705..ff81571b5f 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 9";
+
 rtems_id Queue_id;
 
 rtems_task Test_task(
@@ -29,7 +31,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 9 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     1,
@@ -84,7 +86,7 @@ rtems_task Test_task (
     CALLING_OVERHEAD_MESSAGE_QUEUE_DELETE
   );
 
-  puts( "*** END OF TEST 9 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
index 5714346a8a..f7e4d27af4 100644
--- a/testsuites/tmtests/tm10/task1.c
+++ b/testsuites/tmtests/tm10/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 10";
+
 rtems_id Queue_id;
 long Buffer[4];
 
@@ -41,7 +43,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 10 ***" );
+  TEST_BEGIN();
 
   test_init();
 
@@ -165,6 +167,6 @@ rtems_task Low_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE
   );
 
-  puts( "*** END OF TEST 10 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
index ee1908ad0a..01beb797e7 100644
--- a/testsuites/tmtests/tm11/task1.c
+++ b/testsuites/tmtests/tm11/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 11";
+
 rtems_id Queue_id;
 
 long Buffer[4];
@@ -41,7 +43,7 @@ void Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 11 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     1,
@@ -155,6 +157,6 @@ rtems_task High_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
   );
 
-  puts( "*** END OF TEST 11 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
index eb2e552a24..dcd84c6216 100644
--- a/testsuites/tmtests/tm12/task1.c
+++ b/testsuites/tmtests/tm12/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 12";
+
 rtems_id Queue_id;
 
 long Buffer[4];
@@ -43,7 +45,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 12 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     1,
@@ -132,7 +134,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
   );
 
-  puts( "*** END OF TEST 12 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
index 4f5d489a28..eac1b8bd7c 100644
--- a/testsuites/tmtests/tm13/task1.c
+++ b/testsuites/tmtests/tm13/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 13";
+
 rtems_id Queue_id;
 
 long Buffer[4];
@@ -43,7 +45,7 @@ void Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 13 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     1,
@@ -156,6 +158,6 @@ rtems_task High_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
   );
 
-  puts( "*** END OF TEST 13 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
index 3e917068b3..8a7a5d7e59 100644
--- a/testsuites/tmtests/tm14/task1.c
+++ b/testsuites/tmtests/tm14/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 14";
+
 rtems_id Queue_id;
 
 long Buffer[4];
@@ -43,7 +45,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 14 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     1,
@@ -130,7 +132,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
   );
 
-  puts( "*** END OF TEST 14 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index 72b53b9d53..c3afd68e6c 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 15";
+
 bool     time_set;
 uint32_t eventout;
 
@@ -35,7 +37,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 15 ***" );
+  TEST_BEGIN();
 
   test_init();
 
@@ -193,7 +195,7 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_SEND
   );
 
-  puts( "*** END OF TEST 15 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
index fde7e2b749..c4aa255564 100644
--- a/testsuites/tmtests/tm16/task1.c
+++ b/testsuites/tmtests/tm16/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 16";
+
 uint32_t   Task_count;
 
 rtems_task test_init(
@@ -39,7 +41,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 16 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     rtems_build_name( 'T', 'E', 'S', 'T' ),
@@ -147,6 +149,6 @@ rtems_task High_task(
     CALLING_OVERHEAD_EVENT_SEND
   );
 
-  puts( "*** END OF TEST 16 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
index 39a2752d33..15c51a1f2b 100644
--- a/testsuites/tmtests/tm17/task1.c
+++ b/testsuites/tmtests/tm17/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 17";
+
 uint32_t   Task_count;
 rtems_task_priority Task_priority;
 
@@ -41,7 +43,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 17 ***" );
+  TEST_BEGIN();
 
   Task_priority = RTEMS_MAXIMUM_PRIORITY - 1u;
   if ( OPERATION_COUNT > RTEMS_MAXIMUM_PRIORITY - 2u )
@@ -126,6 +128,6 @@ rtems_task Last_task(
     CALLING_OVERHEAD_TASK_SET_PRIORITY
   );
 
-  puts( "*** END OF TEST 17 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
index 9e9749d8e1..ca607f59f0 100644
--- a/testsuites/tmtests/tm18/task1.c
+++ b/testsuites/tmtests/tm18/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 18";
+
 uint32_t   taskcount;
 rtems_task_priority taskpri;
 
@@ -40,7 +42,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 18 ***" );
+  TEST_BEGIN();
 
   test_init();
 
@@ -107,6 +109,6 @@ rtems_task Last_task(
     CALLING_OVERHEAD_TASK_DELETE
   );
 
-  puts( "*** END OF TEST 18 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
index 037a632ee6..8f07df17f5 100644
--- a/testsuites/tmtests/tm19/task1.c
+++ b/testsuites/tmtests/tm19/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 19";
+
 rtems_asr Process_asr_for_pass_1(
   rtems_signal_set signals
 );
@@ -42,7 +44,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 19 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     rtems_build_name( 'T', 'I', 'M', 'E' ),
@@ -208,6 +210,6 @@ rtems_task Task_3(
     0
   );
 
-  puts( "*** END OF TEST 19 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index f22a428766..ed9c204154 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 20";
+
 rtems_device_major_number _STUB_major = 1;
 
 rtems_id         Region_id;
@@ -54,7 +56,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 20 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     rtems_build_name( 'T', 'I', 'M', '1' ),
@@ -432,7 +434,7 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_CONTROL
   );
 
-  puts( "*** END OF TEST 20 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
index 8813f7b7c3..69c6a96158 100644
--- a/testsuites/tmtests/tm21/task1.c
+++ b/testsuites/tmtests/tm21/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 21";
+
 uint8_t   Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
 uint8_t   Partition_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
 
@@ -30,7 +32,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 21 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     rtems_build_name( 'T', 'I', 'M', 'E' ),
@@ -233,6 +235,6 @@ rtems_task Task_1(
     CALLING_OVERHEAD_RATE_MONOTONIC_IDENT
   );
 
-  puts( "*** END OF TEST 21 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
index c17e92db4a..eb4548648d 100644
--- a/testsuites/tmtests/tm22/task1.c
+++ b/testsuites/tmtests/tm22/task1.c
@@ -15,6 +15,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 22";
+
 rtems_id Queue_id;
 
 long Buffer[4];
@@ -40,7 +42,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 22 ***" );
+  TEST_BEGIN();
 
   status = rtems_message_queue_create(
     rtems_build_name( 'M', 'Q', '1', ' '),
@@ -179,7 +181,7 @@ rtems_task Low_task(
     CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST
   );
 
-  puts( "*** END OF TEST 22 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index 84ab11e5cd..249d62760a 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 23";
+
 rtems_id          Timer_id[ OPERATION_COUNT+1 ];
 
 rtems_time_of_day time_of_day;
@@ -50,7 +52,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 23 ***" );
+  TEST_BEGIN();
 
   benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
@@ -300,6 +302,6 @@ rtems_task Low_task(
     CALLING_OVERHEAD_TASK_WAKE_WHEN
   );
 
-  puts( "*** END OF TEST 23 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
index 8f24117bc0..21de600e94 100644
--- a/testsuites/tmtests/tm24/task1.c
+++ b/testsuites/tmtests/tm24/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 24";
+
 uint32_t   Task_count;
 
 rtems_task Tasks(
@@ -34,7 +36,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 24 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     rtems_build_name( 'H', 'I', 'G', 'H' ),
@@ -117,7 +119,7 @@ rtems_task Tasks(
       CALLING_OVERHEAD_TASK_WAKE_AFTER
     );
 
-  puts( "*** END OF TEST 24 ***" );
+  TEST_END();
     rtems_test_exit( 0 );
   }
   (void) rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
index 0251e5875b..7777b51df9 100644
--- a/testsuites/tmtests/tm25/task1.c
+++ b/testsuites/tmtests/tm25/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 25";
+
 rtems_id Semaphore_id;
 
 rtems_task High_tasks(
@@ -34,7 +36,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 25 ***" );
+  TEST_BEGIN();
 
   status = rtems_semaphore_create(
     rtems_build_name( 'S', 'M', '1', ' ') ,
@@ -104,6 +106,6 @@ rtems_task Low_task(
     CALLING_OVERHEAD_CLOCK_TICK
   );
 
-  puts( "*** END OF TEST 25 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 7003e5adcd..f6cdddfa8b 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -25,6 +25,8 @@
   #define PREVENT_SMP_ASSERT_FAILURES
 #endif
 
+const char rtems_test_name[] = "TIME TEST 26";
+
 /* TEST DATA */
 rtems_id Semaphore_id;
 
@@ -218,12 +220,12 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 26 ***" );
+  TEST_BEGIN();
 
   if (_Scheduler.Operations.initialize != _Scheduler_priority_Initialize) {
     puts("  Error ==> " );
     puts("Test only supported for deterministic priority scheduler\n" );
-    puts( "*** END OF TEST 26 ***" );
+    TEST_END();
     rtems_test_exit( 0 );
   }
 
@@ -762,6 +764,6 @@ void complete_test( void )
     0
   );
 
-  puts( "*** END OF TEST 26 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index 05e2ac71aa..0062a7302f 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -25,6 +25,8 @@
 #define _RTEMS_TMTEST27
 #include <tm27.h>
 
+const char rtems_test_name[] = "TIME TEST 27";
+
 rtems_task Task_1(
   rtems_task_argument argument
 );
@@ -51,11 +53,11 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 27 ***" );
+  TEST_BEGIN();
   if (_Scheduler.Operations.initialize != _Scheduler_priority_Initialize) {
     puts("  Error ==> " );
     puts("Test only supported for deterministic priority scheduler\n" );
-    puts( "*** END OF TEST 26 ***" );
+    TEST_END();
     rtems_test_exit( 0 );
   }
 
@@ -201,7 +203,7 @@ rtems_task Task_1(
    *  goes to Isr_handler and then returns
    */
 
-  puts( "*** END OF TEST 27 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
index ffe5abda38..f157209eb5 100644
--- a/testsuites/tmtests/tm28/task1.c
+++ b/testsuites/tmtests/tm28/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 28";
+
 rtems_id Port_id;
 
 uint8_t   Internal_area[ 256 ] CPU_STRUCTURE_ALIGNMENT;
@@ -31,7 +33,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 28 ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     rtems_build_name( 'T', 'I', 'M', 'E' ),
@@ -129,6 +131,6 @@ rtems_task Test_task (
     CALLING_OVERHEAD_PORT_DELETE
   );
 
-  puts( "*** END OF TEST 28 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
index 0ad7c9eeaf..ef889cbf42 100644
--- a/testsuites/tmtests/tm29/task1.c
+++ b/testsuites/tmtests/tm29/task1.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "TIME TEST 29";
+
 rtems_name Period_name;
 
 rtems_task Tasks(
@@ -36,7 +38,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST 29 ***" );
+  TEST_BEGIN();
 
   Period_name = rtems_build_name( 'P', 'R', 'D', ' ' );
 
@@ -204,6 +206,6 @@ rtems_task Low_task(
     CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
   );
 
-  puts( "*** END OF TEST 29 ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
diff --git a/testsuites/tmtests/tm30/init.c b/testsuites/tmtests/tm30/init.c
index 661445133a..022cdafb4f 100644
--- a/testsuites/tmtests/tm30/init.c
+++ b/testsuites/tmtests/tm30/init.c
@@ -17,6 +17,8 @@
 #include <timesys.h>
 #include "test_support.h"
 
+const char rtems_test_name[] = "TIME TEST 30";
+
 rtems_id barrier[ OPERATION_COUNT ];
 
 rtems_task Init(
@@ -66,7 +68,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TIME TEST 30 ***" );
+  TEST_BEGIN();
 
   rtems_time_test_measure_operation(
     "rtems_barrier_create: only case",
@@ -92,7 +94,7 @@ rtems_task Init(
     0
   );
   
-  puts( "*** END OF TIME TEST 30 ***" );
+  TEST_END();
 
   rtems_test_exit(0);
 }
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
index 2954e062fe..e13181f912 100644
--- a/testsuites/tmtests/tmck/task1.c
+++ b/testsuites/tmtests/tmck/task1.c
@@ -20,6 +20,8 @@
 #undef OPERATION_COUNT
 #define OPERATION_COUNT    100000
 
+const char rtems_test_name[] = "TIME CHECKER";
+
 uint32_t Distribution[ MAXIMUM_DISTRIBUTION + 1 ];
 
 rtems_task Task_1(
@@ -43,7 +45,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME CHECKER ***" );
+  TEST_BEGIN();
 
   Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' ),
 
@@ -136,7 +138,7 @@ rtems_test_pause();
     0
   );
 
-  puts( "*** END OF TIME CHECKER ***" );
+  TEST_END();
   rtems_test_exit( 0 );
 }
 
diff --git a/testsuites/tmtests/tmcontext01/init.c b/testsuites/tmtests/tmcontext01/init.c
index 0a5af45d6c..04aa26f578 100644
--- a/testsuites/tmtests/tmcontext01/init.c
+++ b/testsuites/tmtests/tmcontext01/init.c
@@ -32,6 +32,8 @@
 
 #define CPU_COUNT 32
 
+const char rtems_test_name[] = "TMCONTEXT 1";
+
 static rtems_counter_ticks t[SAMPLES];
 
 static volatile bool always_true = true;
diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
index 370efcf0a6..d14fd8951b 100644
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ b/testsuites/tmtests/tmoverhd/testtask.c
@@ -14,6 +14,8 @@
 #define CONFIGURE_INIT
 #include "system.h"
 
+const char rtems_test_name[] = "OVERHEAD";
+
 uint8_t   Memory_area[ 2048 ];
 uint8_t   Internal_port_area[ 256 ];
 uint8_t   External_port_area[ 256 ];
@@ -32,7 +34,7 @@ rtems_task Init(
 
   Print_Warning();
 
-  puts( "\n\n*** TIME TEST OVERHEAD ***" );
+  TEST_BEGIN();
 
   status = rtems_task_create(
     rtems_build_name( 'T', 'A', '1', ' ' ),
@@ -1258,7 +1260,7 @@ rtems_test_pause();
          0
       );
 
-  puts( "*** END OF TIME OVERHEAD ***" );
+  TEST_END();
 
   rtems_test_exit( 0 );
 }
-- 
cgit v1.2.3