From 3579c752bcf2c160de47ec748c8b649b0028826a Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Mon, 22 Dec 2025 07:57:31 +0000 Subject: [PATCH] 8373876: StackWalkNativeToJava print more output in case of failures Reviewed-by: dholmes, mdoerr --- .../ErrorHandling/StackWalkNativeToJava.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/StackWalkNativeToJava.java b/test/hotspot/jtreg/runtime/ErrorHandling/StackWalkNativeToJava.java index 7d7deffdb6e..f1270e37243 100644 --- a/test/hotspot/jtreg/runtime/ErrorHandling/StackWalkNativeToJava.java +++ b/test/hotspot/jtreg/runtime/ErrorHandling/StackWalkNativeToJava.java @@ -70,7 +70,11 @@ public class StackWalkNativeToJava { output.shouldNotContain("java.lang.RuntimeException: Reached statement after obj.wait()"); output.shouldNotContain("[error occurred during error reporting (printing native stack"); String[] res = output.getOutput().split("StackWalkNativeToJava\\$TestNativeToJavaNative\\.callNativeMethod\\(\\)V"); - assertTrue(res.length - 1 == 2, res.length - 1); + if (res.length != 3) { + output.reportDiagnosticSummary(); + } + + assertTrue(res.length == 3, res.length); output.shouldNotHaveExitValue(0); } @@ -104,7 +108,11 @@ public class StackWalkNativeToJava { output.shouldNotContain("java.lang.RuntimeException: Reached statement after synchronized"); output.shouldNotContain("[error occurred during error reporting (printing native stack"); String[] res = output.getOutput().split("StackWalkNativeToJava\\$TestNativeToJava\\.callVMMethod\\(\\)V"); - assertTrue(res.length - 1 == 2, res.length - 1); + if (res.length != 3) { + output.reportDiagnosticSummary(); + } + + assertTrue(res.length == 3, res.length); output.shouldNotHaveExitValue(0); } @@ -131,4 +139,4 @@ public class StackWalkNativeToJava { throw new RuntimeException("Count error: count was " + count); } } -} \ No newline at end of file +}