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, 68 insertions, 52 deletions

diff --git a/testsuites/sptests/spintrcritical10/init.c b/testsuites/sptests/spintrcritical10/init.c
index f3883f7fa6..8959e5c4e3 100644
--- a/testsuites/sptests/spintrcritical10/init.c
+++ b/testsuites/sptests/spintrcritical10/init.c
@@ -86,10 +86,28 @@ static void any_satisfy_before_timeout(rtems_id timer, void *arg)
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 }
 
+static bool test_body_any_satisfy_before_timeout(void *arg)
+{
+  test_context *ctx = arg;
+  rtems_status_code sc;
+  rtems_event_set out;
+
+  out = DEADBEEF;
+  sc = rtems_event_receive(EVENTS, RTEMS_EVENT_ANY | RTEMS_WAIT, 1, &out);
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+  rtems_test_assert(out == GREEN);
+
+  out = DEADBEEF;
+  sc = rtems_event_receive(EVENTS, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, 0, &out);
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+  rtems_test_assert(out == RED);
+
+  return ctx->hit;
+}
+
 static void test_any_satisfy_before_timeout(test_context *ctx)
 {
   rtems_status_code sc;
-  int resets = 0;
 
   puts(
     "Init - Trying to generate any satisfied before timeout "
@@ -98,27 +116,14 @@ static void test_any_satisfy_before_timeout(test_context *ctx)
 
   ctx->hit = false;
 
-  interrupt_critical_section_test_support_initialize(NULL);
-
   sc = rtems_timer_fire_after(ctx->timer, 1, any_satisfy_before_timeout, ctx);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
-  while (!ctx->hit && resets < 2) {
-    rtems_event_set out;
-
-    if (interrupt_critical_section_test_support_delay())
-      resets++;
-
-    out = DEADBEEF;
-    sc = rtems_event_receive(EVENTS, RTEMS_EVENT_ANY | RTEMS_WAIT, 1, &out);
-    rtems_test_assert(sc == RTEMS_SUCCESSFUL);
-    rtems_test_assert(out == GREEN);
-
-    out = DEADBEEF;
-    sc = rtems_event_receive(EVENTS, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, 0, &out);
-    rtems_test_assert(sc == RTEMS_SUCCESSFUL);
-    rtems_test_assert(out == RED);
-  }
+  interrupt_critical_section_test(
+    test_body_any_satisfy_before_timeout,
+    ctx,
+    NULL
+  );
 
   sc = rtems_timer_cancel(ctx->timer);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
@@ -178,10 +183,23 @@ static void all_satisfy_before_timeout(rtems_id timer, void *arg)
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 }
 
+static bool test_body_all_satisfy_before_timeout(void *arg)
+{
+  test_context *ctx = arg;
+  rtems_status_code sc;
+  rtems_event_set out;
+
+  out = DEADBEEF;
+  sc = rtems_event_receive(EVENTS, RTEMS_EVENT_ALL | RTEMS_WAIT, 1, &out);
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+  rtems_test_assert(out == EVENTS);
+
+  return ctx->hit;
+}
+
 static void test_all_satisfy_before_timeout(test_context *ctx)
 {
   rtems_status_code sc;
-  int resets = 0;
 
   puts(
     "Init - Trying to generate all satisfied before timeout "
@@ -190,22 +208,14 @@ static void test_all_satisfy_before_timeout(test_context *ctx)
 
   ctx->hit = false;
 
-  interrupt_critical_section_test_support_initialize(NULL);
-
   sc = rtems_timer_fire_after(ctx->timer, 1, all_satisfy_before_timeout, ctx);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
-  while (!ctx->hit && resets < 2) {
-    rtems_event_set out;
-
-    if (interrupt_critical_section_test_support_delay())
-      resets++;
-
-    out = DEADBEEF;
-    sc = rtems_event_receive(EVENTS, RTEMS_EVENT_ALL | RTEMS_WAIT, 1, &out);
-    rtems_test_assert(sc == RTEMS_SUCCESSFUL);
-    rtems_test_assert(out == EVENTS);
-  }
+  interrupt_critical_section_test(
+    test_body_all_satisfy_before_timeout,
+    ctx,
+    NULL
+  );
 
   sc = rtems_timer_cancel(ctx->timer);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
@@ -257,10 +267,28 @@ static void timeout_before_satisfied(rtems_id timer, void *arg)
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 }
 
+static bool test_body_timeout_before_all_satisfy(void *arg)
+{
+  test_context *ctx = arg;
+  rtems_event_set out;
+  rtems_status_code sc;
+
+  out = DEADBEEF;
+  sc = rtems_event_receive(EVENTS, RTEMS_EVENT_ALL | RTEMS_WAIT, 1, &out);
+  rtems_test_assert(sc == RTEMS_TIMEOUT);
+  rtems_test_assert(out == DEADBEEF);
+
+  out = DEADBEEF;
+  sc = rtems_event_receive(EVENTS, RTEMS_EVENT_ALL | RTEMS_NO_WAIT, 0, &out);
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+  rtems_test_assert(out == EVENTS);
+
+  return ctx->hit;
+}
+
 static void test_timeout_before_all_satisfy(test_context *ctx)
 {
   rtems_status_code sc;
-  int resets = 0;
 
   puts(
     "Init - Trying to generate timeout before all satisfied "
@@ -269,27 +297,14 @@ static void test_timeout_before_all_satisfy(test_context *ctx)
 
   ctx->hit = false;
 
-  interrupt_critical_section_test_support_initialize(NULL);
-
   sc = rtems_timer_fire_after(ctx->timer, 1, timeout_before_satisfied, ctx);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
-  while (!ctx->hit && resets < 2) {
-    rtems_event_set out;
-
-    if (interrupt_critical_section_test_support_delay())
-      resets++;
-
-    out = DEADBEEF;
-    sc = rtems_event_receive(EVENTS, RTEMS_EVENT_ALL | RTEMS_WAIT, 1, &out);
-    rtems_test_assert(sc == RTEMS_TIMEOUT);
-    rtems_test_assert(out == DEADBEEF);
-
-    out = DEADBEEF;
-    sc = rtems_event_receive(EVENTS, RTEMS_EVENT_ALL | RTEMS_NO_WAIT, 0, &out);
-    rtems_test_assert(sc == RTEMS_SUCCESSFUL);
-    rtems_test_assert(out == EVENTS);
-  }
+  interrupt_critical_section_test(
+    test_body_timeout_before_all_satisfy,
+    ctx,
+    NULL
+  );
 
   sc = rtems_timer_cancel(ctx->timer);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
@@ -326,6 +341,7 @@ static rtems_task Init(
 
 #define CONFIGURE_MAXIMUM_TASKS       1
 #define CONFIGURE_MAXIMUM_TIMERS      1
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE