2009-07-23 Joel Sherrill <joel.sherrill@OARcorp.com>

	* spintrcritical01/init.c, spintrcritical06/init.c,
	spintrcritical08/init.c, spintrcritical09/init.c: Perform some
	cleanup and make the tests more similar.

5 files changed, 19 insertions, 8 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 1002901ba3..75175f50df 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,5 +1,11 @@
 2009-07-23	Joel Sherrill <joel.sherrill@OARcorp.com>
 
+	* spintrcritical01/init.c, spintrcritical06/init.c,
+	spintrcritical08/init.c, spintrcritical09/init.c: Perform some
+	cleanup and make the tests more similar.
+
+2009-07-23	Joel Sherrill <joel.sherrill@OARcorp.com>
+
 	* spintrcritical06/init.c: Test now hits forward and reverse cases.
 
 2009-07-22	Joel Sherrill <joel.sherrill@OARcorp.com>
diff --git a/testsuites/sptests/spintrcritical01/init.c b/testsuites/sptests/spintrcritical01/init.c
index 7b888c19b3..ed98c8719e 100644
--- a/testsuites/sptests/spintrcritical01/init.c
+++ b/testsuites/sptests/spintrcritical01/init.c
@@ -119,9 +119,12 @@ rtems_task Init(
     directive_failed( status, "rtems_semaphore_obtain" );
   }
 
-  puts( "Init - Case hit" );
+  if ( case_hit ) {
+    puts( "Init - Case hit" );
+    puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
+  } else 
+    puts( "Init - Case not hit - ran too long" );
 
-  puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c
index 5783f4066d..e8ce800ac3 100644
--- a/testsuites/sptests/spintrcritical06/init.c
+++ b/testsuites/sptests/spintrcritical06/init.c
@@ -91,6 +91,7 @@ rtems_task Init(
   puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" );
 
   puts( "Init - Trying to generate semaphore release from ISR while blocking" );
+  puts( "Init - There is no way for the test to know if it hits the case" );
   puts( "Init - Variation is: " TEST_STRING );
   status = rtems_semaphore_create(
     rtems_build_name( 'S', 'M', '1', ' ' ),
diff --git a/testsuites/sptests/spintrcritical08/init.c b/testsuites/sptests/spintrcritical08/init.c
index 51b5b17c4b..357e0ac4aa 100644
--- a/testsuites/sptests/spintrcritical08/init.c
+++ b/testsuites/sptests/spintrcritical08/init.c
@@ -79,7 +79,8 @@ rtems_task Init(
   if ( case_hit ) {
     puts( "Init - It appears the case has been hit" );
     puts( "*** END OF TEST INTERRUPT CRITICAL SECTION 08 ***" );
-  }
+  } else 
+    puts( "Init - Case not hit - ran too long" );
   rtems_test_exit(0);
 }
 
diff --git a/testsuites/sptests/spintrcritical09/init.c b/testsuites/sptests/spintrcritical09/init.c
index 46faf214e8..76c0818bd6 100644
--- a/testsuites/sptests/spintrcritical09/init.c
+++ b/testsuites/sptests/spintrcritical09/init.c
@@ -78,12 +78,12 @@ rtems_task Init(
     (void) rtems_semaphore_obtain( Semaphore, RTEMS_DEFAULT_OPTIONS, 1 );
   }
 
-  if (!case_hit)
-    rtems_test_exit(0);
-
-  puts( "Init - It appears we hit the case" );
+  if ( case_hit ) {
+    puts( "Init - It appears the case has been hit" );
+    puts( "*** END OF TEST INTERRUPT CRITICAL SECTION 09 ***" );
+  } else 
+    puts( "Init - Case not hit - ran too long" );
 
-  puts( "*** END OF TEST INTERRUPT CRITICAL SECTION 09 ***" );
   rtems_test_exit(0);
 }