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

	* psxtest/init.c, psxtest_with_thread/init.c, psxtmtest_single/init.c,
	smptest/init.c, sptest/init.c, sptest_operation_from_tsr/init.c,
	sptest_with_task/init.c, tmtest/init.c: Switch to @TESTNUM@ for start
	and ending message.

9 files changed, 23 insertions, 16 deletions

diff --git a/rtems-test-template/ChangeLog b/rtems-test-template/ChangeLog
index 18f76b5..c010446 100644
--- a/rtems-test-template/ChangeLog
+++ b/rtems-test-template/ChangeLog
@@ -1,5 +1,12 @@
 2011-07-20	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* psxtest/init.c, psxtest_with_thread/init.c, psxtmtest_single/init.c,
+	smptest/init.c, sptest/init.c, sptest_operation_from_tsr/init.c,
+	sptest_with_task/init.c, tmtest/init.c: Switch to @TESTNUM@ for start
+	and ending message.
+
+2011-07-20	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* psxtmtest_blocking/init.c: Add template for POSIX timing test of
 	unblocking operation with no preemption.
 	* psxtmtest_unblocking_nopreempt/Makefile.am,
diff --git a/rtems-test-template/psxtest/init.c b/rtems-test-template/psxtest/init.c
index 7fe2535..895c142 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 @DESC@ ***" );
+  puts( "\n\n*** POSIX TEST @TESTNUM@ ***" );
 
   /* XXX test code goes here */
   
-  puts( "*** END OF POSIX TEST @DESC@ ***" );
+  puts( "*** END OF POSIX TEST @TESTNUM@ ***" );
 
   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 82eff69..cf113b6 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 @DESC@ ***" );
+  puts( "\n\n*** POSIX TEST @TESTNUM@ ***" );
 
   status = pthread_create( &ThreadId, NULL, TestThread, NULL );
   rtems_test_assert( !status );
 
-  puts( "*** END OF POSIX TEST @DESC@ ***" );
+  puts( "*** END OF POSIX TEST @TESTNUM@ ***" );
 
   rtems_test_exit(0);
 }
diff --git a/rtems-test-template/psxtmtest_single/init.c b/rtems-test-template/psxtmtest_single/init.c
index d9a24a6..332e7a3 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 @UPPER@ ***" );
+  puts( "\n\n*** POSIX TIME TEST @TESTNUMR@ ***" );
 
   /* XXX any required initialization goes here */
 
   benchmark_NAME_OF_OPERATION();
   
-  puts( "*** END OF POSIX TIME TEST @UPPER@ ***" );
+  puts( "*** END OF POSIX TIME TEST @TESTNUMR@ ***" );
 
   rtems_test_exit(0);
 }
diff --git a/rtems-test-template/smptest/init.c b/rtems-test-template/smptest/init.c
index 9b384f5..f767725 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 @UPPER@ ***" );
+  puts( "\n\n*** TEST @TESTNUM@ ***" );
 
   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 @UPPER@ ***" );
+  puts( "*** END OF TEST @TESTNUM@ ***" );
   rtems_test_exit(0);
 }
 
diff --git a/rtems-test-template/sptest/init.c b/rtems-test-template/sptest/init.c
index c85485f..f17c467 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 @DESC@ ***" );
+  puts( "\n\n*** TEST @TESTNUM@ ***" );
 
   /* XXX test code goes here */
   
-  puts( "*** END OF TEST @DESC@ ***" );
+  puts( "*** END OF TEST @TESTNUM@ ***" );
 
   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 d6ddb08..b28fffa 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 @DESC@ ***" );
+  puts( "\n\n*** TEST @TESTNUM@ ***" );
 
   /*
    *  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 @DESC@ ***" );
+  puts( "*** END OF TEST @TESTNUM@ ***" );
   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 41a9607..26c066c 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 @DESC@ ***" );
+  puts( "\n\n*** TEST @TESTNUM@ ***" );
 
   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 @DESC@ ***" );
+  puts( "*** END OF TEST @TESTNUM@ ***" );
 
   rtems_test_exit(0);
 }
diff --git a/rtems-test-template/tmtest/init.c b/rtems-test-template/tmtest/init.c
index 9cc734a..29bc30e 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 @DESC@ ***" );
+  puts( "\n\n*** TIME TEST @TESTNUM@ ***" );
 
   /* XXX test code goes here */
   
-  puts( "*** END OF TIME TEST @DESC@ ***" );
+  puts( "*** END OF TIME TEST @TESTNUM@ ***" );
 
   rtems_test_exit(0);
 }