From 78f06b2816ab22344529fdd480a64716e202ee79 Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Sun, 26 May 2024 15:18:26 +0800 Subject: [PATCH] 8332922: Test java/io/IO/IO.java fails when /usr/bin/expect not exist Signed-off-by: sendaoYan --- test/jdk/java/io/IO/IO.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/jdk/java/io/IO/IO.java b/test/jdk/java/io/IO/IO.java index 6bbf9a2772463..dd63222e1eb0a 100644 --- a/test/jdk/java/io/IO/IO.java +++ b/test/jdk/java/io/IO/IO.java @@ -29,7 +29,7 @@ import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; -import jtreg.SkippedException; +import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.condition.EnabledOnOs; @@ -46,7 +46,7 @@ * @bug 8305457 * @summary java.io.IO tests * @library /test/lib - * @run junit/othervm IO + * @run junit IO */ public class IO { @@ -61,8 +61,7 @@ public class OSSpecificTests { public static void prepareTTY() { expect = Paths.get("/usr/bin/expect"); // os-specific path if (!Files.exists(expect) || !Files.isExecutable(expect)) { - System.out.println("jtreg.SkippedException: '" + expect + "' not found"); - System.exit(JCK_STATUS_BASE); + Assumptions.abort("'" + expect + "' not found"); } }