From 75fed1b941c9fc1ccecf3eb055cac52399383da7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 23 Jul 2009 18:04:53 +0000 Subject: 2009-07-23 Joel Sherrill * spintrcritical01/init.c, spintrcritical06/init.c, spintrcritical08/init.c, spintrcritical09/init.c: Perform some cleanup and make the tests more similar. --- testsuites/sptests/ChangeLog | 6 ++++++ testsuites/sptests/spintrcritical01/init.c | 7 +++++-- testsuites/sptests/spintrcritical06/init.c | 1 + testsuites/sptests/spintrcritical08/init.c | 3 ++- testsuites/sptests/spintrcritical09/init.c | 10 +++++----- 5 files changed, 19 insertions(+), 8 deletions(-) (limited to 'testsuites/sptests') diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index 1002901ba3..75175f50df 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,9 @@ +2009-07-23 Joel Sherrill + + * 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 * spintrcritical06/init.c: Test now hits forward and reverse cases. 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); } -- cgit v1.2.3