From c033806b8c285ebeefb62fbeec1c27a1ca60a46c Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Thu, 9 Jan 2025 10:03:54 +0000
Subject: [PATCH] 8346739: jpackage tests failed after JDK-8345259

Reviewed-by: shade, mchung, asemenyuk
Backport-of: 7ba969a576eb92446e40587fecf98e1e4aba8883
---
 .../tools/jpackage/share/RuntimeImageSymbolicLinksTest.java    | 2 ++
 test/jdk/tools/jpackage/share/RuntimeImageTest.java            | 2 ++
 test/jdk/tools/jpackage/share/RuntimePackageTest.java          | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java b/test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java
index 404cd3b6d3a..db74e3456c4 100644
--- a/test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java
@@ -51,6 +51,7 @@ public class RuntimeImageSymbolicLinksTest {
 
     @Test
     public static void test() throws Exception {
+        final Path jmods = Path.of(System.getProperty("java.home"), "jmods");
         final Path workDir = TKit.createTempDirectory("runtime").resolve("data");
         final Path jlinkOutputDir = workDir.resolve("temp.runtime");
         Files.createDirectories(jlinkOutputDir.getParent());
@@ -61,6 +62,7 @@ public class RuntimeImageSymbolicLinksTest {
         .addArguments(
                 "--output", jlinkOutputDir.toString(),
                 "--add-modules", "ALL-MODULE-PATH",
+                "--module-path", jmods.toString(),
                 "--strip-debug",
                 "--no-header-files",
                 "--no-man-pages",
diff --git a/test/jdk/tools/jpackage/share/RuntimeImageTest.java b/test/jdk/tools/jpackage/share/RuntimeImageTest.java
index f3751c9ee47..65e8c448d39 100644
--- a/test/jdk/tools/jpackage/share/RuntimeImageTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimeImageTest.java
@@ -44,6 +44,7 @@ public class RuntimeImageTest {
 
     @Test
     public static void test() throws Exception {
+        final Path jmods = Path.of(System.getProperty("java.home"), "jmods");
         final Path workDir = TKit.createTempDirectory("runtime").resolve("data");
         final Path jlinkOutputDir = workDir.resolve("temp.runtime");
         Files.createDirectories(jlinkOutputDir.getParent());
@@ -54,6 +55,7 @@ public class RuntimeImageTest {
         .addArguments(
                 "--output", jlinkOutputDir.toString(),
                 "--add-modules", "ALL-MODULE-PATH",
+                "--module-path", jmods.toString(),
                 "--strip-debug",
                 "--no-header-files",
                 "--no-man-pages",
diff --git a/test/jdk/tools/jpackage/share/RuntimePackageTest.java b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
index 0b505babcc5..73f1c525654 100644
--- a/test/jdk/tools/jpackage/share/RuntimePackageTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
@@ -101,6 +101,8 @@ public class RuntimePackageTest {
         .forTypes(types)
         .addInitializer(cmd -> {
             final Path runtimeImageDir;
+            final Path jmods = Path.of(System.getProperty("java.home"), "jmods");
+
             if (JPackageCommand.DEFAULT_RUNTIME_IMAGE != null) {
                 runtimeImageDir = JPackageCommand.DEFAULT_RUNTIME_IMAGE;
             } else {
@@ -112,6 +114,7 @@ public class RuntimePackageTest {
                 .addArguments(
                         "--output", runtimeImageDir.toString(),
                         "--add-modules", "ALL-MODULE-PATH",
+                        "--module-path", jmods.toString(),
                         "--strip-debug",
                         "--no-header-files",
                         "--no-man-pages")