8303948: HsErrFileUtils.checkHsErrFileContent() fails to check the la…

…st pattern. Reviewed-by: dholmes, stuefe
openjdk · Mar 21, 2023 · a72ba38 · a72ba38 · openjdk-notifier · Mar 21, 2023
1 parent bbca7c3
commit a72ba38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java b/test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java
@@ -130,8 +130,8 @@ public static void checkHsErrFileContent(File f, Pattern[] positivePatterns, Pat
                 lastLine = line;
                 lineNo++;
             }
-            // Found all positive pattern?
-            if (!positivePatternStack.isEmpty()) {
+            // If the current pattern is not null then it didn't match
+            if (currentPositivePattern != null) {
                 throw new RuntimeException("hs-err file incomplete (first missing pattern: " + currentPositivePattern.pattern() + ")");
             }
             if (checkEndMarker && !lastLine.equals("END.")) {

diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestSigInfoInHsErrFile.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestSigInfoInHsErrFile.java
@@ -68,7 +68,7 @@ public static void main(String[] args) throws Exception {
     patterns.add(Pattern.compile("# .*VMError::controlled_crash.*"));
 
     // Crash address: see VMError::_segfault_address
-    String crashAddress = Platform.isAix() ? "0x0*1400" : "0x0*400";
+    String crashAddress = Platform.isAix() ? "0xffffffffffffffff" : "0x0*400";
     patterns.add(Pattern.compile("siginfo: si_signo: \\d+ \\(SIGSEGV\\), si_code: \\d+ \\(SEGV_.*\\), si_addr: " + crashAddress + ".*"));
 
     HsErrFileUtils.checkHsErrFileContent(f, patterns.toArray(new Pattern[] {}), true);