Skip to content

Commit 72d8e98

Browse files
committed
8230228: [TESTBUG] Several runtime/ErrorHandling tests may fail on some platforms
Reviewed-by: coleenp, stuefe, mseledtsov
1 parent 5b34d00 commit 72d8e98

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static void main(String[] args) throws Exception {
5757

5858
// we should have crashed with a SIGSEGV
5959
output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
60-
output_detail.shouldMatch("# +(?:SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*");
60+
output_detail.shouldMatch("# +(?:SIGSEGV|SIGBUS|EXCEPTION_ACCESS_VIOLATION).*");
6161

6262
// extract hs-err file
6363
String hs_err_file = output_detail.firstMatch("# *(\\S*hs_err_pid\\d+\\.log)", 1);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static void do_test(boolean redirectStdout, boolean redirectStderr) throw
5858

5959
// we should have crashed with a SIGSEGV
6060
output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
61-
output_detail.shouldMatch("# +(?:SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*");
61+
output_detail.shouldMatch("# +(?:SIGSEGV|SIGBUS|EXCEPTION_ACCESS_VIOLATION).*");
6262

6363
// If no redirection happened, we should find a mention of the file in the output.
6464
String hs_err_file = output_detail.firstMatch("# *(\\S*hs_err_pid\\d+\\.log)", 1);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static void main(String[] args) throws Exception {
6161

6262
// we should have crashed with a SIGSEGV
6363
output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
64-
output_detail.shouldMatch("# +(?:SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*");
64+
output_detail.shouldMatch("# +(?:SIGSEGV|SIGBUS|EXCEPTION_ACCESS_VIOLATION).*");
6565

6666
// extract hs-err file
6767
String hs_err_file = output_detail.firstMatch("# *(\\S*hs_err_pid\\d+\\.log)", 1);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static void main(String[] args) throws Exception {
9595

9696
// we should have crashed with a SIGSEGV
9797
output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
98-
output_detail.shouldMatch("# +(?:SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*");
98+
output_detail.shouldMatch("# +(?:SIGSEGV|SIGBUS|EXCEPTION_ACCESS_VIOLATION).*");
9999

100100
// VM should have been aborted by WatcherThread
101101
output_detail.shouldMatch(".*timer expired, abort.*");

0 commit comments

Comments
 (0)