2008-01-24 Joel Sherrill <joel.sherrill@oarcorp.com>

	* sp28/init.c, sp28/sp28.scn, sp29/init.c, sp29/sp29.scn, sp32/init.c,
	sp32/sp32.scn, sp33/init.c, sp33/sp33.scn, sp42/init.c: Fix end of
	test messages.

10 files changed, 20 insertions, 14 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 065b1950f9..b7ecea8a4a 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-24	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* sp28/init.c, sp28/sp28.scn, sp29/init.c, sp29/sp29.scn, sp32/init.c,
+	sp32/sp32.scn, sp33/init.c, sp33/sp33.scn, sp42/init.c: Fix end of
+	test messages.
+
 2008-01-23	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* sp34/changepri.c, sp35/priinv.c: Convert the Objects_Name type from a
diff --git a/testsuites/sptests/sp28/init.c b/testsuites/sptests/sp28/init.c
index eb1c2e742d..7ecc9031b7 100644
--- a/testsuites/sptests/sp28/init.c
+++ b/testsuites/sptests/sp28/init.c
@@ -81,7 +81,7 @@ subtask (rtems_task_argument arg)
   while (nRunning)
     rtems_task_wake_after(0);
 
-  puts("*** END OF TEST SP28 ***" );
+  puts("*** END OF TEST 28 ***" );
   rtems_test_exit(0);
 }
 
@@ -344,7 +344,7 @@ void test_delete_as_side_effect(void)
 
 rtems_task Init (rtems_task_argument ignored)
 {
-  puts("*** START OF TEST SP28 ***" );
+  puts("*** START OF TEST 28 ***" );
 
   test_errors();
 
diff --git a/testsuites/sptests/sp28/sp28.scn b/testsuites/sptests/sp28/sp28.scn
index 2919bcc38c..0afe571017 100644
--- a/testsuites/sptests/sp28/sp28.scn
+++ b/testsuites/sptests/sp28/sp28.scn
@@ -1,5 +1,5 @@
-*** START OF TEST SP28 ***
+*** START OF TEST 28 ***
 Task variables test begins.  Any output between
 this line and the `Task variables test complete' line indicates an error.
 Task variables test succeeded.
-*** END OF TEST SP28 ***
+*** END OF TEST 28 ***
diff --git a/testsuites/sptests/sp29/init.c b/testsuites/sptests/sp29/init.c
index f5873d2bb4..d40200b0c3 100644
--- a/testsuites/sptests/sp29/init.c
+++ b/testsuites/sptests/sp29/init.c
@@ -180,6 +180,6 @@ rtems_task Init (rtems_task_argument ignored)
 			printf ("%d: Obtained obtain non-recursive-lock semaphore too quickly -- %d ticks not %d ticks\n", __LINE__, diff, (2 * ticksPerSecond) );
 	}
 
-	puts( "*** END OF SP29 ***" );
+	puts( "*** END OF TEST 29 ***" );
 	exit (0);
 }
diff --git a/testsuites/sptests/sp29/sp29.scn b/testsuites/sptests/sp29/sp29.scn
index 700ed7f98f..0bb9345053 100644
--- a/testsuites/sptests/sp29/sp29.scn
+++ b/testsuites/sptests/sp29/sp29.scn
@@ -1,4 +1,4 @@
 *** SP29 - SIMPLE SEMAPHORE TEST ***
 This test only prints on errors.
-*** END OF SP29 ***
+*** END OF TEST 29 ***
 
diff --git a/testsuites/sptests/sp32/init.c b/testsuites/sptests/sp32/init.c
index e0d9a42b82..5dc44eec86 100644
--- a/testsuites/sptests/sp32/init.c
+++ b/testsuites/sptests/sp32/init.c
@@ -107,6 +107,6 @@ rtems_task Init(
   }
 
   /* the end */
-  printf("*** END OF TEST SP32 ***\n");
-  exit(0);
+  puts("*** END OF TEST 32 ***");
+  rtems_test_exit(0);
 }
diff --git a/testsuites/sptests/sp32/sp32.scn b/testsuites/sptests/sp32/sp32.scn
index 358a45dc2b..0168856365 100644
--- a/testsuites/sptests/sp32/sp32.scn
+++ b/testsuites/sptests/sp32/sp32.scn
@@ -4,4 +4,4 @@ period 1: measured 50 tick(s), wanted 50
 period 2: measured 200 tick(s), wanted 200
 period 3: measured 25 tick(s), wanted 25
 period 4: measured 3 tick(s), wanted 3
-*** END OF TEST SP32 ***
+*** END OF TEST 32 ***
diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c
index dbb2d5d881..da89c57f6a 100644
--- a/testsuites/sptests/sp33/init.c
+++ b/testsuites/sptests/sp33/init.c
@@ -239,6 +239,6 @@ rtems_task Init(
   directive_failed(status, "rtems_task_wake_after");
 
   /* the end */
-  printf("*** END OF TEST SP33 ***\n");
-  exit(0);
+  puts("*** END OF TEST 33 ***");
+  rtems_test_exit(0);
 }
diff --git a/testsuites/sptests/sp33/sp33.scn b/testsuites/sptests/sp33/sp33.scn
index aa09516e6b..9ec1487c8f 100644
--- a/testsuites/sptests/sp33/sp33.scn
+++ b/testsuites/sptests/sp33/sp33.scn
@@ -45,4 +45,4 @@ Waiter 3 back from barrier
 Waiter 0 back from barrier
 Waiter 1 back from barrier
 Waiter 2 back from barrier
-*** END OF TEST SP33 ***
+*** END OF TEST 33 ***
diff --git a/testsuites/sptests/sp42/init.c b/testsuites/sptests/sp42/init.c
index 8a836d27fd..3cd29ba95d 100644
--- a/testsuites/sptests/sp42/init.c
+++ b/testsuites/sptests/sp42/init.c
@@ -130,7 +130,7 @@ rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** SP40 ***" );
+  puts( "\n\n*** START OF TEST 40 ***" );
 
   if ( sizeof( Priorities ) / sizeof( rtems_task_priority ) != MAX_TASKS ) {
     puts( "Priorities table does not have right number of entries" );
@@ -151,7 +151,7 @@ rtems_task Init(
   puts( "Exercising blocking discipline w/unblock in priority order" );
   do_test( RTEMS_PRIORITY, FALSE );
 
-  puts( "*** END OF SP40 ***" );
+  puts( "*** END OF TEST 40 ***" );
   exit(0);
 }