Skip to content

Commit a72ba38

Browse files
varada1110David Holmes
authored and
David Holmes
committed
8303948: HsErrFileUtils.checkHsErrFileContent() fails to check the last pattern.
Reviewed-by: dholmes, stuefe
1 parent bbca7c3 commit a72ba38

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ public static void checkHsErrFileContent(File f, Pattern[] positivePatterns, Pat
130130
lastLine = line;
131131
lineNo++;
132132
}
133-
// Found all positive pattern?
134-
if (!positivePatternStack.isEmpty()) {
133+
// If the current pattern is not null then it didn't match
134+
if (currentPositivePattern != null) {
135135
throw new RuntimeException("hs-err file incomplete (first missing pattern: " + currentPositivePattern.pattern() + ")");
136136
}
137137
if (checkEndMarker && !lastLine.equals("END.")) {

test/hotspot/jtreg/runtime/ErrorHandling/TestSigInfoInHsErrFile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static void main(String[] args) throws Exception {
6868
patterns.add(Pattern.compile("# .*VMError::controlled_crash.*"));
6969

7070
// Crash address: see VMError::_segfault_address
71-
String crashAddress = Platform.isAix() ? "0x0*1400" : "0x0*400";
71+
String crashAddress = Platform.isAix() ? "0xffffffffffffffff" : "0x0*400";
7272
patterns.add(Pattern.compile("siginfo: si_signo: \\d+ \\(SIGSEGV\\), si_code: \\d+ \\(SEGV_.*\\), si_addr: " + crashAddress + ".*"));
7373

7474
HsErrFileUtils.checkHsErrFileContent(f, patterns.toArray(new Pattern[] {}), true);

0 commit comments

Comments
 (0)