tests: Rework interrupt critical tests

This avoids test durations of more than one hour on fast targets, since
fast targets can count a lot during one clock tick period, so the minor
loop iteration count was quite high.  Estimate now the test body
duration to iterate only through the interesting time window.

Add and use interrupt_critical_section_test().

1 files changed, 15 insertions, 17 deletions

diff --git a/testsuites/sptests/spintrcritical16/init.c b/testsuites/sptests/spintrcritical16/init.c
index f1858000bc..08eeb8b9b4 100644
--- a/testsuites/sptests/spintrcritical16/init.c
+++ b/testsuites/sptests/spintrcritical16/init.c
@@ -24,9 +24,8 @@ rtems_timer_service_routine test_release_from_isr(rtems_id  timer, void *arg);
 Thread_blocking_operation_States getState(void);
 
 Thread_Control *Main_TCB;
-rtems_id        Main_task;
 rtems_id        Semaphore;
-volatile bool   case_hit;
+volatile bool   case_hit = false;
 
 Thread_blocking_operation_States getState(void)
 {
@@ -59,12 +58,23 @@ rtems_timer_service_routine test_release_from_isr(
   }
 }
 
+static bool test_body( void *arg )
+{
+  rtems_status_code sc;
+
+  (void) arg;
+
+  sc = rtems_semaphore_obtain( Semaphore, RTEMS_DEFAULT_OPTIONS, 2 );
+  rtems_test_assert( sc == RTEMS_SUCCESSFUL || sc == RTEMS_TIMEOUT );
+
+  return case_hit;
+}
+
 rtems_task Init(
   rtems_task_argument ignored
 )
 {
   rtems_status_code     sc;
-  int                   resets;
 
   TEST_BEGIN();
   puts(
@@ -82,22 +92,9 @@ rtems_task Init(
   );
   directive_failed( sc, "rtems_semaphore_create of SM1" );
 
-  Main_task = rtems_task_self();
   Main_TCB  = _Thread_Get_executing();
 
-  interrupt_critical_section_test_support_initialize( test_release_from_isr );
-
-  case_hit = false;
-
-  for (resets=0 ; !case_hit && resets<10 ;) {
-    if ( interrupt_critical_section_test_support_delay() )
-      resets++;
-
-    sc = rtems_semaphore_obtain( Semaphore, RTEMS_DEFAULT_OPTIONS, 2 );
-    if ( sc == RTEMS_SUCCESSFUL )
-      break;
-    fatal_directive_status( sc, RTEMS_TIMEOUT, "rtems_semaphore_obtain" );
-  }
+  interrupt_critical_section_test( test_body, NULL, test_release_from_isr );
 
   if ( case_hit ) {
     puts( "Init - Case hit" );
@@ -117,6 +114,7 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_TASKS          1
 #define CONFIGURE_MAXIMUM_TIMERS         1
 #define CONFIGURE_MAXIMUM_SEMAPHORES     1
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1
 #define CONFIGURE_MICROSECONDS_PER_TICK  1000
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION