Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.

8271350: runtime/Safepoint tests use OutputAnalyzer::shouldMatch instead of shouldContaint #285

Closed
wants to merge 1 commit into from
Closed

8271350: runtime/Safepoint tests use OutputAnalyzer::shouldMatch instead of shouldContaint #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/hotspot/jtreg/runtime/Safepoint/TestAbortOnVMOperationTimeout.java
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@ public static void testWith(int delay, boolean shouldPass) throws Exception {
if (shouldPass) {
output.shouldHaveExitValue(0);
} else {
output.shouldMatch("VM operation took too long");
output.shouldContain("VM operation took too long");
output.shouldNotHaveExitValue(0);
}
}
Expand Down
8 changes: 4 additions & 4 deletions test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java
View file
Open in desktop
Expand Up @@ -55,13 +55,13 @@ public static void main(String[] args) throws Exception {
);

OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldMatch("Timed out while spinning to reach a safepoint.");
output.shouldContain("Timed out while spinning to reach a safepoint.");
if (Platform.isWindows()) {
output.shouldMatch("Safepoint sync time longer than");
output.shouldContain("Safepoint sync time longer than");
} else {
output.shouldMatch("SIGILL");
output.shouldContain("SIGILL");
if (Platform.isLinux()) {
output.shouldMatch("(sent by kill)");
output.shouldContain("(sent by kill)");
}
}
output.shouldNotHaveExitValue(0);
Expand Down