Merge pull request #663 from pshipton/uncaught

Cause a better system dump on failure of UncaughtExceptionsTest
ibmruntimes · Jun 1, 2023 · 359f15b · 359f15b
2 parents 4c9f7d7 + 2458fae
commit 359f15b
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/test/jdk/java/lang/Thread/UncaughtExceptionsTest.java b/test/jdk/java/lang/Thread/UncaughtExceptionsTest.java
@@ -67,14 +67,9 @@ public Object[][] testCases() {
     public void test(String className, int exitValue, String stdOutMatch, String stdErrMatch) throws Throwable {
         ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(String.format("UncaughtExitSimulator$%s",className));
         OutputAnalyzer outputAnalyzer = ProcessTools.executeCommand(processBuilder);
-        try {
-            outputAnalyzer.shouldHaveExitValue(exitValue);
-            outputAnalyzer.stderrShouldMatch(stdErrMatch);
-            outputAnalyzer.stdoutShouldMatch(stdOutMatch);
-        } catch (RuntimeException e) {
-            com.ibm.jvm.Dump.SystemDump();
-            throw e;
-        }
+        outputAnalyzer.shouldHaveExitValue(exitValue);
+        outputAnalyzer.stderrShouldMatch(stdErrMatch);
+        outputAnalyzer.stdoutShouldMatch(stdOutMatch);
     }
 
 }
@@ -98,7 +93,12 @@ class UncaughtExitSimulator extends Thread implements Runnable {
 
     public static void throwRuntimeException() { throw new RuntimeException("simulateUncaughtExitEvent"); }
 
-    public void run() { throwRuntimeException(); }
+    public void run() {
+        if (!Thread.currentThread().getName().equals("Thread-0")) {
+            com.ibm.jvm.Dump.SystemDump();
+        }
+        throwRuntimeException();
+    }
 
     /**
      * A thread is never alive after you've join()ed it.