2011-07-21 Joel Sherrill <joel.sherrill@oarcorp.com>

	* psxtest/init.c, psxtest_with_thread/init.c,
	psxtmtest_blocking/init.c, psxtmtest_single/init.c,
	psxtmtest_unblocking_nopreempt/init.c,
	psxtmtest_unblocking_preempt/init.c, smptest/init.c, sptest/init.c,
	sptest_operation_from_tsr/init.c, sptest_with_task/init.c,
	tmtest/init.c: Standardize start and end messages.

12 files changed, 31 insertions, 22 deletions

diff --git a/rtems-test-template/ChangeLog b/rtems-test-template/ChangeLog
index a131352..397fea4 100644
--- a/rtems-test-template/ChangeLog
+++ b/rtems-test-template/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-21	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* psxtest/init.c, psxtest_with_thread/init.c,
+	psxtmtest_blocking/init.c, psxtmtest_single/init.c,
+	psxtmtest_unblocking_nopreempt/init.c,
+	psxtmtest_unblocking_preempt/init.c, smptest/init.c, sptest/init.c,
+	sptest_operation_from_tsr/init.c, sptest_with_task/init.c,
+	tmtest/init.c: Standardize start and end messages.
+
 2011-07-20	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* psxtmtest_unblocking_preempt/Makefile.am,
diff --git a/rtems-test-template/psxtest/init.c b/rtems-test-template/psxtest/init.c
index 895c142..e5976fa 100644
--- a/rtems-test-template/psxtest/init.c
+++ b/rtems-test-template/psxtest/init.c
@@ -16,11 +16,11 @@ void *POSIX_Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** POSIX TEST @TESTNUM@ ***" );
+  puts( "\n\n*** POSIX TEST @UPPER@ ***" );
 
   /* XXX test code goes here */
   
-  puts( "*** END OF POSIX TEST @TESTNUM@ ***" );
+  puts( "*** END OF POSIX TEST @UPPER@ ***" );
 
   rtems_test_exit(0);
 }
diff --git a/rtems-test-template/psxtest_with_thread/init.c b/rtems-test-template/psxtest_with_thread/init.c
index cf113b6..89f6573 100644
--- a/rtems-test-template/psxtest_with_thread/init.c
+++ b/rtems-test-template/psxtest_with_thread/init.c
@@ -28,12 +28,12 @@ void *POSIX_Init(
 {
   int status;
 
-  puts( "\n\n*** POSIX TEST @TESTNUM@ ***" );
+  puts( "\n\n*** POSIX TEST @UPPER@ ***" );
 
   status = pthread_create( &ThreadId, NULL, TestThread, NULL );
   rtems_test_assert( !status );
 
-  puts( "*** END OF POSIX TEST @TESTNUM@ ***" );
+  puts( "*** END OF POSIX TEST @UPPER@ ***" );
 
   rtems_test_exit(0);
 }
diff --git a/rtems-test-template/psxtmtest_blocking/init.c b/rtems-test-template/psxtmtest_blocking/init.c
index 45b3e39..6d9880e 100644
--- a/rtems-test-template/psxtmtest_blocking/init.c
+++ b/rtems-test-template/psxtmtest_blocking/init.c
@@ -36,7 +36,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST @TESTNUM@ ***" );
+  puts( "*** END OF POSIX TIME TEST @UPPER@ ***" );
 
   rtems_test_exit( 0 );
   return NULL;
@@ -58,7 +58,7 @@ void *POSIX_Init(
   int        status;
   pthread_t  threadId;
 
-  puts( "\n\n*** POSIX TIME TEST @TESTNUM@ ***" );
+  puts( "\n\n*** POSIX TIME TEST @UPPER@ ***" );
 
   for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
     status = pthread_create( &threadId, NULL, Middle, NULL );
diff --git a/rtems-test-template/psxtmtest_single/init.c b/rtems-test-template/psxtmtest_single/init.c
index 332e7a3..d9a24a6 100644
--- a/rtems-test-template/psxtmtest_single/init.c
+++ b/rtems-test-template/psxtmtest_single/init.c
@@ -43,13 +43,13 @@ void *POSIX_Init(
 )
 {
 
-  puts( "\n\n*** POSIX TIME TEST @TESTNUMR@ ***" );
+  puts( "\n\n*** POSIX TIME TEST @UPPER@ ***" );
 
   /* XXX any required initialization goes here */
 
   benchmark_NAME_OF_OPERATION();
   
-  puts( "*** END OF POSIX TIME TEST @TESTNUMR@ ***" );
+  puts( "*** END OF POSIX TIME TEST @UPPER@ ***" );
 
   rtems_test_exit(0);
 }
diff --git a/rtems-test-template/psxtmtest_unblocking_nopreempt/init.c b/rtems-test-template/psxtmtest_unblocking_nopreempt/init.c
index 7487108..087f88b 100644
--- a/rtems-test-template/psxtmtest_unblocking_nopreempt/init.c
+++ b/rtems-test-template/psxtmtest_unblocking_nopreempt/init.c
@@ -42,7 +42,7 @@ void *POSIX_Init(
   pthread_t  threadId;
   long       end_time;
 
-  puts( "\n\n*** POSIX TIME TEST XXX @TESTNUM@ ***" );
+  puts( "\n\n*** POSIX TIME TEST @UPPER@ ***" );
 
   status = pthread_create( &threadId, NULL, Blocker, NULL );
   rtems_test_assert( status == 0 );
@@ -80,7 +80,7 @@ void *POSIX_Init(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST XXX @TESTNUM@ ***" );
+  puts( "*** END OF POSIX TIME TEST @UPPER@ ***" );
   rtems_test_exit( 0 );
 
   return NULL;
diff --git a/rtems-test-template/psxtmtest_unblocking_preempt/init.c b/rtems-test-template/psxtmtest_unblocking_preempt/init.c
index 6af709a..b92d709 100644
--- a/rtems-test-template/psxtmtest_unblocking_preempt/init.c
+++ b/rtems-test-template/psxtmtest_unblocking_preempt/init.c
@@ -43,7 +43,7 @@ void *Low(
     0
   );
 
-  puts( "*** END OF POSIX TIME TEST XXX @TESTNUM@ ***" );
+  puts( "*** END OF POSIX TIME TEST @UPPER@ ***" );
   rtems_test_exit( 0 );
   return NULL;
 }
@@ -79,7 +79,7 @@ void *POSIX_Init(
   pthread_attr_t      attr;
   struct sched_param  param;
 
-  puts( "\n\n*** POSIX TIME TEST XXX @TESTNUM@ ***" );
+  puts( "\n\n*** POSIX TIME TEST @UPPER@ ***" );
 
   /*
    * Deliberately create the XXX BEFORE the threads.  This way the
diff --git a/rtems-test-template/smptest/init.c b/rtems-test-template/smptest/init.c
index f767725..9b384f5 100644
--- a/rtems-test-template/smptest/init.c
+++ b/rtems-test-template/smptest/init.c
@@ -29,7 +29,7 @@ rtems_task Init(
   rtems_id           id;
   rtems_status_code  status;
 
-  puts( "\n\n*** TEST @TESTNUM@ ***" );
+  puts( "\n\n*** TEST @UPPER@ ***" );
 
   for ( i=0; i<_SMP_Processor_count-1; i++ ) {
     ch = '1' + i;
@@ -53,7 +53,7 @@ rtems_task Init(
 
   /* XXX something goes here */
 
-  puts( "*** END OF TEST @TESTNUM@ ***" );
+  puts( "*** END OF TEST @UPPER@ ***" );
   rtems_test_exit(0);
 }
 
diff --git a/rtems-test-template/sptest/init.c b/rtems-test-template/sptest/init.c
index f17c467..69cf4fe 100644
--- a/rtems-test-template/sptest/init.c
+++ b/rtems-test-template/sptest/init.c
@@ -16,11 +16,11 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST @TESTNUM@ ***" );
+  puts( "\n\n*** TEST @UPPER@ ***" );
 
   /* XXX test code goes here */
   
-  puts( "*** END OF TEST @TESTNUM@ ***" );
+  puts( "*** END OF TEST @UPPER@ ***" );
 
   rtems_test_exit(0);
 }
diff --git a/rtems-test-template/sptest_operation_from_tsr/init.c b/rtems-test-template/sptest_operation_from_tsr/init.c
index b28fffa..078106c 100644
--- a/rtems-test-template/sptest_operation_from_tsr/init.c
+++ b/rtems-test-template/sptest_operation_from_tsr/init.c
@@ -31,7 +31,7 @@ rtems_task Init(
   rtems_status_code     status;
   rtems_id              timer;
 
-  puts( "\n\n*** TEST @TESTNUM@ ***" );
+  puts( "\n\n*** TEST @UPPER@ ***" );
 
   /*
    *  Timer used in multiple ways
@@ -68,7 +68,7 @@ rtems_task Init(
   /* XXX also may be able to confirm operation actually was performed */
 
   puts( "Operation from ISR successfully processed" );
-  puts( "*** END OF TEST @TESTNUM@ ***" );
+  puts( "*** END OF TEST @UPPER@ ***" );
   rtems_test_exit( 0 );
 }
 
diff --git a/rtems-test-template/sptest_with_task/init.c b/rtems-test-template/sptest_with_task/init.c
index 26c066c..27bbf7a 100644
--- a/rtems-test-template/sptest_with_task/init.c
+++ b/rtems-test-template/sptest_with_task/init.c
@@ -26,7 +26,7 @@ rtems_task Init(
   rtems_status_code status;
   rtems_id          task_id;
 
-  puts( "\n\n*** TEST @TESTNUM@ ***" );
+  puts( "\n\n*** TEST @UPPER@ ***" );
 
   status = rtems_task_create(
     rtems_build_name( 'T', 'E', 'S', 'T' ),
@@ -41,7 +41,7 @@ rtems_task Init(
   status = rtems_task_start( task_id, Test_task, 0 );
   directive_failed( status, "rtems_task_start" );
 
-  puts( "*** END OF TEST @TESTNUM@ ***" );
+  puts( "*** END OF TEST @UPPER@ ***" );
 
   rtems_test_exit(0);
 }
diff --git a/rtems-test-template/tmtest/init.c b/rtems-test-template/tmtest/init.c
index 29bc30e..d4a20d3 100644
--- a/rtems-test-template/tmtest/init.c
+++ b/rtems-test-template/tmtest/init.c
@@ -18,11 +18,11 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TIME TEST @TESTNUM@ ***" );
+  puts( "\n\n*** TIME TEST @UPPER@ ***" );
 
   /* XXX test code goes here */
   
-  puts( "*** END OF TIME TEST @TESTNUM@ ***" );
+  puts( "*** END OF TIME TEST @UPPER@ ***" );
 
   rtems_test_exit(0);
 }