From f1e15c8c8f598f3726fd6b3f65fe5ab155a2ee28 Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Tue, 27 Jul 2021 23:20:19 +0000 Subject: [PATCH] 8271350: runtime/Safepoint tests use OutputAnalyzer::shouldMatch instead of shouldContaint Reviewed-by: mseledtsov, dholmes --- .../runtime/Safepoint/TestAbortOnVMOperationTimeout.java | 2 +- .../runtime/Safepoint/TestAbortVMOnSafepointTimeout.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/hotspot/jtreg/runtime/Safepoint/TestAbortOnVMOperationTimeout.java b/test/hotspot/jtreg/runtime/Safepoint/TestAbortOnVMOperationTimeout.java index 806e6d282e2..c4bc60585c0 100644 --- a/test/hotspot/jtreg/runtime/Safepoint/TestAbortOnVMOperationTimeout.java +++ b/test/hotspot/jtreg/runtime/Safepoint/TestAbortOnVMOperationTimeout.java @@ -74,7 +74,7 @@ public class TestAbortOnVMOperationTimeout { if (shouldPass) { output.shouldHaveExitValue(0); } else { - output.shouldMatch("VM operation took too long"); + output.shouldContain("VM operation took too long"); output.shouldNotHaveExitValue(0); } } diff --git a/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java b/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java index ebeb4cce2a1..ee51458757c 100644 --- a/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java +++ b/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java @@ -55,13 +55,13 @@ public class TestAbortVMOnSafepointTimeout { ); 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);