From 478427f5aef153723b298a7eca396e4aa467b1af Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 7 Jan 2025 14:35:36 +0100 Subject: [PATCH] Adjust BasicTest for ALL-MODULE-PATH and JDK-8345259 --- test/jdk/tools/jpackage/share/BasicTest.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/test/jdk/tools/jpackage/share/BasicTest.java b/test/jdk/tools/jpackage/share/BasicTest.java index 01558fcbd9b36..d479f4a35d084 100644 --- a/test/jdk/tools/jpackage/share/BasicTest.java +++ b/test/jdk/tools/jpackage/share/BasicTest.java @@ -62,12 +62,15 @@ public final class BasicTest { public static Collection addModulesParams() { List params = new ArrayList<>(); - params.add(new Object[][] { new String[] { "ALL-DEFAULT" } }); - params.add(new Object[][] { new String[] { "java.desktop" } }); - params.add(new Object[][] { new String[] { "java.desktop,jdk.jartool" } }); - params.add(new Object[][] { new String[] { "java.desktop", "jdk.jartool" } }); + params.add(new Object[][] { new String[] { "--add-modules", "ALL-DEFAULT" } }); + params.add(new Object[][] { new String[] { "--add-modules", "java.desktop" } }); + params.add(new Object[][] { new String[] { "--add-modules", "java.desktop,jdk.jartool" } }); + params.add(new Object[][] { new String[] { "--add-modules", "java.desktop", "--add-modules", "jdk.jartool" } }); if (isAllModulePathCapable()) { - params.add(new Object[][] { new String[] { "ALL-MODULE-PATH" } }); + final Path jmods = Path.of(System.getProperty("java.home"), "jmods"); + params.add(new Object[][] { new String[] { "--add-modules", "ALL-MODULE-PATH", + // Since JDK-8345259 ALL-MODULE-PATH requires --module-path arg + "--module-path", jmods.toString() } }); } return Collections.unmodifiableList(params); } @@ -338,8 +341,7 @@ public void testAddModules(String[] addModulesArg) { JPackageCommand cmd = JPackageCommand .helloAppImage("goodbye.jar:com.other/com.other.Hello") .ignoreDefaultRuntime(true); // because of --add-modules - Stream.of(addModulesArg).map(v -> Stream.of("--add-modules", v)).flatMap( - s -> s).forEachOrdered(cmd::addArgument); + Stream.of(addModulesArg).forEachOrdered(cmd::addArgument); cmd.executeAndAssertHelloAppImageCreated(); }