Check interrupt handler after each test case

hpi-swa · Dec 20, 2023 · b321bf2 · b321bf2
1 parent f681f27
commit b321bf2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/...trufflesqueak.test/src/de/hpi/swa/trufflesqueak/test/AbstractSqueakTestCaseWithImage.java b/...trufflesqueak.test/src/de/hpi/swa/trufflesqueak/test/AbstractSqueakTestCaseWithImage.java
@@ -184,6 +184,12 @@ protected static TestResult runTestCase(final TestRequest request) {
             throw new RuntimeException("Test was interrupted");
         } catch (final ExecutionException e) {
             return TestResult.fromException("failed with an error", e.getCause());
+        } finally {
+            final String reason = image.interrupt.activeTest();
+            if (reason != null) {
+                printlnErr(request.testCase + ">>" + request.testSelector + " left interrupt handling in inconsistent state, reason: " + reason);
+            }
+            image.interrupt.clearState();
         }
     }
 
@@ -195,7 +201,6 @@ protected static <T, R> R runWithTimeout(final T argument, final Function<T, R>
             } finally {
                 testWithImageIsActive = false;
             }
-
         });
         try {
             return future.get(timeout, TimeUnit.SECONDS);

diff --git a/....trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/interrupts/CheckForInterruptsState.java b/....trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/interrupts/CheckForInterruptsState.java
@@ -159,18 +159,36 @@ public void resetTrigger() {
      * TESTING
      */
 
+    public String activeTest() {
+        if (nextWakeupTick > 0) {
+            return "Timer";
+        } else if (interruptPending) {
+            return "Interrupt";
+        } else if (pendingFinalizationSignals) {
+            return "Finalization";
+        } else if (!semaphoresToSignal.isEmpty()) {
+            return "Semaphore";
+        } else {
+            return null;
+        }
+    }
+
+    public void clearState() {
+        nextWakeupTick = 0;
+        interruptPending = false;
+        pendingFinalizationSignals = false;
+        clearWeakPointersQueue();
+        semaphoresToSignal.clear();
+    }
+
     public void reset() {
         CompilerAsserts.neverPartOfCompilation("Resetting interrupt handler only supported for testing purposes");
         isActive = true;
-        nextWakeupTick = 0;
         if (interruptChecks != null) {
             interruptChecks.cancel(true);
         }
         shutdown();
-        interruptPending = false;
-        pendingFinalizationSignals = false;
-        clearWeakPointersQueue();
-        semaphoresToSignal.clear();
+        clearState();
     }
 
     private void clearWeakPointersQueue() {