From b77c2ea4e9e7840fe67c6cae4967365c6709acc7 Mon Sep 17 00:00:00 2001 From: Yasumasa Suenaga Date: Sat, 25 May 2019 20:55:33 +0900 Subject: [PATCH] 8224252: [TESTBUG] hotspot/test/serviceability/sa/sadebugd/SADebugDTest.java is timing out again after fix for JDK-8163805 Reviewed-by: cjplummer, sspitsyn --- .../jtreg/serviceability/sa/sadebugd/SADebugDTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java index d2c419e48d9..60dbcea9e91 100644 --- a/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java +++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java @@ -23,9 +23,11 @@ /** * @test + * @bug 8163805 8224252 * @summary Checks that the jshdb debugd utility sucessfully starts * and tries to attach to a running process * @requires vm.hasSAandCanAttach + * @requires os.family != "windows" * @modules java.base/jdk.internal.misc * @library /test/lib * @@ -40,7 +42,7 @@ import static jdk.test.lib.process.ProcessTools.startProcess; public class SADebugDTest { - private static final String GOLDEN = "Attaching to process"; + private static final String GOLDEN = "Debugger attached"; public static void main(String[] args) throws Exception { LingeredApp app = null; @@ -62,10 +64,9 @@ public class SADebugDTest { // If we are here, this means we have received the golden line and the test has passed // The debugd remains running, we have to kill it debugd.destroy(); + debugd.waitFor(); } finally { - if (app != null) { - LingeredApp.stopApp(app); - } + LingeredApp.stopApp(app); } }