tmtests: Make output more uniform

29 files changed, 136 insertions, 134 deletions

diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
index 4706d64419..3ca782e081 100644
--- a/testsuites/tmtests/tm01/task1.c
+++ b/testsuites/tmtests/tm01/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2011.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -86,7 +86,7 @@ rtems_task Test_task(
     );
   end_time = benchmark_timer_read();
   put_time(
-    "rtems_semaphore_create",
+    "rtems_semaphore_create: only case",
     end_time,
     1,
     0,
@@ -99,7 +99,7 @@ rtems_task Test_task(
     (void) rtems_semaphore_delete( smid );
   end_time = benchmark_timer_read();
   put_time(
-    "rtems_semaphore_delete",
+    "rtems_semaphore_delete: only case",
     end_time,
     1,
     0,
@@ -170,7 +170,7 @@ rtems_task Test_task(
   );
 
   put_time(
-    "rtems_semaphore_obtain: not available -- NO_WAIT",
+    "rtems_semaphore_obtain: not available NO_WAIT",
     semaphore_obtain_no_wait_time,
     OPERATION_COUNT * OPERATION_COUNT,
     semaphore_obtain_loop_time,
diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
index 1efa2857a8..bda688d872 100644
--- a/testsuites/tmtests/tm02/task1.c
+++ b/testsuites/tmtests/tm02/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2011.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -147,7 +147,7 @@ rtems_task Low_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_semaphore_obtain: not available -- caller blocks",
+    "rtems_semaphore_obtain: not available caller blocks",
     end_time,
     operation_count - 1,
     0,
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
index 53cda4ece1..a3c4593243 100644
--- a/testsuites/tmtests/tm03/task1.c
+++ b/testsuites/tmtests/tm03/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2011.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -138,7 +138,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_semaphore_release: task readied -- preempts caller",
+    "rtems_semaphore_release: task readied preempts caller",
     end_time,
     operation_count - 1,
     0,
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
index 651e499096..c554568758 100644
--- a/testsuites/tmtests/tm04/task1.c
+++ b/testsuites/tmtests/tm04/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -98,7 +98,7 @@ rtems_task Highest_task(
     end_time = benchmark_timer_read();
 
     put_time(
-      "rtems_task_restart: blocked task -- preempts caller",
+      "rtems_task_restart: blocked task preempts caller",
       end_time,
       1,
       0,
@@ -191,7 +191,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_task_create",
+    "rtems_task_create: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -205,7 +205,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_task_start",
+    "rtems_task_start: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
index 65ca485958..90cd3f0e52 100644
--- a/testsuites/tmtests/tm05/task1.c
+++ b/testsuites/tmtests/tm05/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2008.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -95,7 +95,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_task_resume: task readied -- preempts caller",
+    "rtems_task_resume: task readied preempts caller",
     end_time,
     operation_count,
     0,
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
index bf3c38c16f..5395650f49 100644
--- a/testsuites/tmtests/tm06/task1.c
+++ b/testsuites/tmtests/tm06/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -129,7 +129,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_task_resume: task readied -- returns to caller",
+    "rtems_task_resume: task readied returns to caller",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
index ad6cc52b3f..9b3eb71387 100644
--- a/testsuites/tmtests/tm07/task1.c
+++ b/testsuites/tmtests/tm07/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -89,7 +89,7 @@ rtems_task High_task(
     end_time = benchmark_timer_read();
 
     put_time(
-      "rtems_task_restart: suspended task -- preempts caller",
+      "rtems_task_restart: suspended task preempts caller",
       end_time,
       operation_count,
       0,
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index e26c2c19da..7aa9c1c7a9 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -167,7 +167,7 @@ rtems_task test_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_task_mode: reschedule -- returns to caller",
+    "rtems_task_mode: reschedule returns to caller",
     end_time,
     1,
     0,
@@ -190,7 +190,7 @@ rtems_task test_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_task_set_note",
+    "rtems_task_set_note: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -203,7 +203,7 @@ rtems_task test_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_task_get_note",
+    "rtems_task_get_note: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -218,7 +218,7 @@ rtems_task test_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_clock_set",
+    "rtems_clock_set: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -231,7 +231,7 @@ rtems_task test_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_clock_get_tod",
+    "rtems_clock_get_tod: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index b91a746f51..83abb342a4 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -63,7 +63,7 @@ rtems_task Test_task (
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_message_queue_create",
+    "rtems_message_queue_create: only case",
     end_time,
     1,
     0,
@@ -77,7 +77,7 @@ rtems_task Test_task (
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_message_queue_delete",
+    "rtems_message_queue_delete: only case",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
index 818d1d996b..89266cfa96 100644
--- a/testsuites/tmtests/tm10/task1.c
+++ b/testsuites/tmtests/tm10/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -110,7 +110,7 @@ void test_init()
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_message_queue_receive: not available -- NO_WAIT",
+    "rtems_message_queue_receive: not available NO_WAIT",
     end_time,
     operation_count,
     overhead,
@@ -158,7 +158,7 @@ rtems_task Low_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_message_queue_receive: not available -- caller blocks",
+    "rtems_message_queue_receive: not available caller blocks",
     end_time,
     operation_count - 1,
     0,
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
index 29e36f9655..436db65334 100644
--- a/testsuites/tmtests/tm11/task1.c
+++ b/testsuites/tmtests/tm11/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -148,7 +148,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_message_queue_send: task readied -- preempts caller",
+    "rtems_message_queue_send: task readied preempts caller",
     end_time,
     operation_count,
     0,
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
index f39ddfa5bf..729e6d07ca 100644
--- a/testsuites/tmtests/tm12/task1.c
+++ b/testsuites/tmtests/tm12/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -125,7 +125,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_message_queue_send: task readied -- returns to caller",
+    "rtems_message_queue_send: task readied returns to caller",
     end_time,
     operation_count - 1,
     overhead,
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
index 7998f31b65..5a9e053a57 100644
--- a/testsuites/tmtests/tm13/task1.c
+++ b/testsuites/tmtests/tm13/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -149,7 +149,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_message_queue_urgent: task readied -- preempts caller",
+    "rtems_message_queue_urgent: task readied preempts caller",
     end_time,
     operation_count,
     0,
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
index 6f9932ccc3..9dd1c571b4 100644
--- a/testsuites/tmtests/tm14/task1.c
+++ b/testsuites/tmtests/tm14/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -123,7 +123,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_message_queue_urgent: task readied -- returns to caller",
+    "rtems_message_queue_urgent: task readied returns to caller",
     end_time,
     operation_count,
     overhead,
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index c542730b04..778f9d5c09 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2011.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -120,7 +120,7 @@ void test_init(void)
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_event_receive: not available -- NO_WAIT",
+    "rtems_event_receive: not available NO_WAIT",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -138,7 +138,7 @@ rtems_task Low_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_event_receive: not available -- caller blocks",
+    "rtems_event_receive: not available caller blocks",
     end_time,
     OPERATION_COUNT,
     0,
@@ -186,7 +186,7 @@ rtems_task Low_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_event_send: task readied -- returns to caller",
+    "rtems_event_send: task readied returns to caller",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
index 44bee190e3..9f4f751b87 100644
--- a/testsuites/tmtests/tm16/task1.c
+++ b/testsuites/tmtests/tm16/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -140,7 +140,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_event_send: task readied -- preempts caller",
+    "rtems_event_send: task readied preempts caller",
     end_time,
     operation_count - 1u,
     0u,
diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
index 2d9ced41fb..103d040af1 100644
--- a/testsuites/tmtests/tm19/task1.c
+++ b/testsuites/tmtests/tm19/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -127,7 +127,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_signal_catch",
+    "rtems_signal_catch: only case",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index 46d30c864c..ab85018fdf 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -109,7 +109,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_partition_create",
+    "rtems_partition_create: only case",
     end_time,
     1,
     0,
@@ -130,7 +130,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_region_create",
+    "rtems_region_create: only case",
     end_time,
     1,
     0,
@@ -181,7 +181,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_partition_return_buffer",
+    "rtems_partition_return_buffer: only case",
     end_time,
     1,
     0,
@@ -203,7 +203,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_partition_delete",
+    "rtems_partition_delete: only case",
     end_time,
     1,
     0,
@@ -248,7 +248,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_region_get_segment: not available -- NO_WAIT",
+    "rtems_region_get_segment: not available NO_WAIT",
     end_time,
     1,
     0,
@@ -293,7 +293,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_region_return_segment: task readied -- preempts caller",
+    "rtems_region_return_segment: task readied preempts caller",
     end_time,
     1,
     0,
@@ -342,7 +342,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_region_delete",
+    "rtems_region_delete: only case",
     end_time,
     1,
     0,
@@ -360,7 +360,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_io_initialize",
+    "rtems_io_initialize: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -373,7 +373,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_io_open",
+    "rtems_io_open: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -386,7 +386,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_io_close",
+    "rtems_io_close: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -399,7 +399,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_io_read",
+    "rtems_io_read: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -412,7 +412,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_io_write",
+    "rtems_io_write: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -425,7 +425,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_io_control",
+    "rtems_io_control: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -445,7 +445,7 @@ rtems_task Task_2(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_region_get_segment: not available -- caller blocks",
+    "rtems_region_get_segment: not available caller blocks",
     end_time,
     1,
     0,
@@ -462,7 +462,7 @@ rtems_task Task_2(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_region_return_segment: task readied -- returns to caller",
+    "rtems_region_return_segment: task readied returns to caller",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
index 3a63977394..054dbf74f3 100644
--- a/testsuites/tmtests/tm21/task1.c
+++ b/testsuites/tmtests/tm21/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -135,7 +135,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_task_ident",
+    "rtems_task_ident: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -148,7 +148,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_message_queue_ident",
+    "rtems_message_queue_ident: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -161,7 +161,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_semaphore_ident",
+    "rtems_semaphore_ident: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -174,7 +174,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_partition_ident",
+    "rtems_partition_ident: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -187,7 +187,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_region_ident",
+    "rtems_region_ident: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -200,7 +200,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_port_ident",
+    "rtems_port_ident: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -213,7 +213,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_timer_ident",
+    "rtems_timer_ident: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -226,7 +226,7 @@ rtems_task Task_1(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_rate_monotonic_ident",
+    "rtems_rate_monotonic_ident: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
index 79d30f7df3..d483319fec 100644
--- a/testsuites/tmtests/tm22/task1.c
+++ b/testsuites/tmtests/tm22/task1.c
@@ -1,6 +1,6 @@
 /*
  *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -98,7 +98,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_message_queue_broadcast: task readied -- returns to caller",
+    "rtems_message_queue_broadcast: task readied returns to caller",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index 02991cbbf2..9ea2857832 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -112,7 +112,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_timer_create",
+    "rtems_timer_create: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -293,7 +293,7 @@ rtems_task Low_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_task_wake_when",
+    "rtems_task_wake_when: only case",
     end_time,
     operation_count,
     0,
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
index 2969654fd1..02b42a8142 100644
--- a/testsuites/tmtests/tm24/task1.c
+++ b/testsuites/tmtests/tm24/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -85,7 +85,7 @@ rtems_task High_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_task_wake_after: yield -- returns to caller",
+    "rtems_task_wake_after: yield returns to caller",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -110,7 +110,7 @@ rtems_task Tasks(
     end_time = benchmark_timer_read();
 
     put_time(
-      "rtems_task_wake_after: yields -- preempts caller",
+      "rtems_task_wake_after: yields preempts caller",
       end_time,
       OPERATION_COUNT,
       overhead,
diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
index 47302087f7..77ef2ad84d 100644
--- a/testsuites/tmtests/tm25/task1.c
+++ b/testsuites/tmtests/tm25/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -97,7 +97,7 @@ rtems_task Low_task(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_clock_tick",
+    "rtems_clock_tick: only case",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 5a51f4c209..e68dc6d4c2 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2011.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -590,7 +590,7 @@ void complete_test( void )
    */
 
   put_time(
-    "_ISR_Disable",
+    "rtems interrupt: _ISR_Disable",
     isr_disable_time,
     1,
     0,
@@ -598,7 +598,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_ISR_Flash",
+    "rtems interrupt: _ISR_Flash",
     isr_flash_time,
     1,
     0,
@@ -606,7 +606,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_ISR_Enable",
+    "rtems interrupt: _ISR_Enable",
     isr_enable_time,
     1,
     0,
@@ -614,7 +614,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_Thread_Disable_dispatch",
+    "rtems internal: _Thread_Disable_dispatch",
     thread_disable_dispatch_time,
     1,
     0,
@@ -622,7 +622,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_Thread_Enable_dispatch",
+    "rtems internal: _Thread_Enable_dispatch",
     thread_enable_dispatch_time,
     1,
     0,
@@ -630,7 +630,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_Thread_Set_state",
+    "rtems internal: _Thread_Set_state",
     thread_set_state_time,
     1,
     0,
@@ -638,7 +638,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_Thread_Dispatch (NO FP)",
+    "rtems internal: _Thread_Dispatch NO FP",
     thread_dispatch_no_fp_time,
     1,
     0,
@@ -646,7 +646,7 @@ void complete_test( void )
   );
 
   put_time(
-    "context switch: no floating point contexts",
+    "rtems internal: context switch: no floating point contexts",
     context_switch_no_fp_time,
     1,
     0,
@@ -654,7 +654,7 @@ void complete_test( void )
   );
 
   put_time(
-    "context switch: self",
+    "rtems internal: context switch: self",
     context_switch_self_time,
     1,
     0,
@@ -662,7 +662,7 @@ void complete_test( void )
   );
 
   put_time(
-    "context switch: to another task",
+    "rtems internal: context switch to another task",
     context_switch_another_task_time,
     1,
     0,
@@ -671,7 +671,7 @@ void complete_test( void )
 
 #if (CPU_HARDWARE_FP == 1) || (CPU_SOFTWARE_FP == 1)
   put_time(
-    "fp context switch: restore 1st FP task",
+    "rtems internal: fp context switch restore 1st FP task",
     context_switch_restore_1st_fp_time,
     1,
     0,
@@ -679,7 +679,7 @@ void complete_test( void )
   );
 
   put_time(
-    "fp context switch: save idle, restore initialized",
+    "rtems internal: fp context switch save idle and restore initialized",
     context_switch_save_idle_restore_initted_time,
     1,
     0,
@@ -687,7 +687,7 @@ void complete_test( void )
   );
 
   put_time(
-    "fp context switch: save idle, restore idle",
+    "rtems internal: fp context switch save idle, restore idle",
     context_switch_save_restore_idle_time,
     1,
     0,
@@ -695,21 +695,24 @@ void complete_test( void )
   );
 
   put_time(
-    "fp context switch: save initialized, restore initialized",
+    "rtems internal: fp context switch save initialized, restore initialized",
     context_switch_save_restore_initted_time,
     1,
     0,
     0
   );
 #else
-    puts( "fp context switch: restore 1st FP task - NA" );
-    puts( "fp context switch: save idle, restore initialized - NA" );
-    puts( "fp context switch: save idle, restore idle - NA" );
-    puts( "fp context switch: save initialized, restore initialized - NA" );
+    puts(
+     "rtems internal: fp context switch restore 1st FP task - NA\n"
+     "rtems internal: fp context switch save idle restore initialized - NA\n"
+     "rtems internal: fp context switch save idle restore idle - NA\n"
+     "rtems internal: fp context switch save initialized\n"
+                      " restore initialized - NA"
+   );
 #endif
 
   put_time(
-    "_Thread_Resume",
+    "rtems internal: _Thread_Resume",
     thread_resume_time,
     1,
     0,
@@ -717,7 +720,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_Thread_Unblock",
+    "rtems internal: _Thread_Unblock",
     thread_unblock_time,
     1,
     0,
@@ -725,7 +728,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_Thread_Ready",
+    "rtems internal: _Thread_Ready",
     thread_ready_time,
     1,
     0,
@@ -733,7 +736,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_Thread_Get",
+    "rtems internal: _Thread_Get",
     thread_get_time,
     OPERATION_COUNT,
     0,
@@ -741,7 +744,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_Semaphore_Get",
+    "rtems internal: _Semaphore_Get",
     semaphore_get_time,
     OPERATION_COUNT,
     0,
@@ -749,7 +752,7 @@ void complete_test( void )
   );
 
   put_time(
-    "_Thread_Get: invalid id",
+    "rtems internal: _Thread_Get: invalid id",
     thread_get_invalid_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index 7b6726d119..bf04d19c59 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2011.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -126,7 +126,7 @@ rtems_task Task_1(
   Interrupt_return_time = benchmark_timer_read();
 
   put_time(
-    "interrupt entry overhead: returns to interrupted task",
+    "rtems interrupt: entry overhead returns to interrupted task",
     Interrupt_enter_time,
     1,
     0,
@@ -134,7 +134,7 @@ rtems_task Task_1(
   );
 
   put_time(
-    "interrupt exit overhead: returns to interrupted task",
+    "rtems interrupt: exit overhead returns to interrupted task",
     Interrupt_return_time,
     1,
     0,
@@ -162,7 +162,7 @@ rtems_task Task_1(
   _Thread_Dispatch_set_disable_level( 0 );
 
   put_time(
-    "interrupt entry overhead: returns to nested interrupt",
+    "rtems interrupt: entry overhead returns to nested interrupt",
     Interrupt_enter_nested_time,
     1,
     0,
@@ -170,7 +170,7 @@ rtems_task Task_1(
   );
 
   put_time(
-    "interrupt exit overhead: returns to nested interrupt",
+    "rtems interrupt: exit overhead returns to nested interrupt",
     Interrupt_return_nested_time,
     1,
     0,
@@ -232,7 +232,7 @@ rtems_task Task_2(
   end_time = benchmark_timer_read();
 
   put_time(
-    "interrupt entry overhead: returns to preempting task",
+    "rtems interrupt: entry overhead returns to preempting task",
     Interrupt_enter_time,
     1,
     0,
@@ -240,7 +240,7 @@ rtems_task Task_2(
   );
 
   put_time(
-    "interrupt exit overhead: returns to preempting task",
+    "rtems interrupt: exit overhead returns to preempting task",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
index 465b13b98c..ce59cb4285 100644
--- a/testsuites/tmtests/tm28/task1.c
+++ b/testsuites/tmtests/tm28/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -76,7 +76,7 @@ rtems_task Test_task (
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_port_create",
+    "rtems_port_create: only case",
     end_time,
     1,
     0,
@@ -93,7 +93,7 @@ rtems_task Test_task (
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_port_external_to_internal",
+    "rtems_port_external_to_internal: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -110,7 +110,7 @@ rtems_task Test_task (
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_port_internal_to_external",
+    "rtems_port_internal_to_external: only case",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -122,7 +122,7 @@ rtems_task Test_task (
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_port_delete",
+    "rtems_port_delete: only case",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
index d322cdb37d..d71cd363e6 100644
--- a/testsuites/tmtests/tm29/task1.c
+++ b/testsuites/tmtests/tm29/task1.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -45,7 +45,7 @@ rtems_task Init(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_rate_monotonic_create",
+    "rtems_rate_monotonic_create: only case",
     end_time,
     1,
     0,
@@ -57,7 +57,7 @@ rtems_task Init(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_rate_monotonic_period: initiate period -- returns to caller",
+    "rtems_rate_monotonic_period: initiate period returns to caller",
     end_time,
     1,
     0,
@@ -81,7 +81,7 @@ rtems_task Init(
   end_time = benchmark_timer_read();
 
   put_time(
-    "rtems_rate_monotonic_cancel",
+    "rtems_rate_monotonic_cancel: only case",
     end_time,
     1,
     0,
@@ -197,7 +197,7 @@ rtems_task Low_task(
   overhead = benchmark_timer_read();
 
   put_time(
-    "rtems_rate_monotonic_period: conclude periods -- caller blocks",
+    "rtems_rate_monotonic_period: conclude periods caller blocks",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm30/init.c b/testsuites/tmtests/tm30/init.c
index 2d96649097..33e6ce7c4e 100644
--- a/testsuites/tmtests/tm30/init.c
+++ b/testsuites/tmtests/tm30/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2012.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -69,7 +69,7 @@ rtems_task Init(
   puts( "\n\n*** TIME TEST 30 ***" );
 
   rtems_time_test_measure_operation(
-    "rtems_barrier_create",
+    "rtems_barrier_create: only case",
     benchmark_barrier_create,
     NULL,
     OPERATION_COUNT,
@@ -77,7 +77,7 @@ rtems_task Init(
   );
   
   rtems_time_test_measure_operation(
-    "rtems_barrier_ident",
+    "rtems_barrier_ident: only case",
     benchmark_barrier_ident,
     NULL,
     OPERATION_COUNT,
@@ -85,7 +85,7 @@ rtems_task Init(
   );
   
   rtems_time_test_measure_operation(
-    "rtems_barrier_delete",
+    "rtems_barrier_delete: only case",
     benchmark_barrier_delete,
     NULL,
     OPERATION_COUNT,
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
index 994ebd98b2..dd398048e3 100644
--- a/testsuites/tmtests/tmck/task1.c
+++ b/testsuites/tmtests/tmck/task1.c
@@ -1,6 +1,5 @@
 /*
- *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2013.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -78,7 +77,7 @@ rtems_test_pause();
   end_time = benchmark_timer_read();
 
   put_time(
-    "NULL timer stopped at",
+    "Time Check: NULL timer stopped at",
     end_time,
     1,
     0,
@@ -91,7 +90,7 @@ rtems_test_pause();
   end_time = benchmark_timer_read();
 
   put_time(
-    "LOOP (1000) timer stopped at",
+    "Time Check: LOOP (1000) timer stopped at",
     end_time,
     1,
     0,
@@ -104,7 +103,7 @@ rtems_test_pause();
   end_time = benchmark_timer_read();
 
   put_time(
-    "LOOP (10000) timer stopped at",
+    "Time Check: LOOP (10000) timer stopped at",
     end_time,
     1,
     0,
@@ -117,7 +116,7 @@ rtems_test_pause();
   end_time = benchmark_timer_read();
 
   put_time(
-    "LOOP (50000) timer stopped at",
+    "Time Check: LOOP (50000) timer stopped at",
     end_time,
     1,
     0,
@@ -130,7 +129,7 @@ rtems_test_pause();
   end_time = benchmark_timer_read();
 
   put_time(
-    "LOOP (100000) timer stopped at",
+    "Time Check: LOOP (100000) timer stopped at",
     end_time,
     1,
     0,