From 90f62aaa18a3caf5a7883121ae37c6edb9f73c48 Mon Sep 17 00:00:00 2001
From: Daniel Hu <costmuch@amazon.com>
Date: Wed, 9 Apr 2025 18:09:36 +0000
Subject: [PATCH] Backport 5a6aa569aa279141193038dc2e61e18a8b24bc11

---
 .../jpackage/share/RuntimePackageTest.java    | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/test/jdk/tools/jpackage/share/RuntimePackageTest.java b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
index e3ebdd3327e..12edff1cea5 100644
--- a/test/jdk/tools/jpackage/share/RuntimePackageTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
@@ -25,7 +25,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -34,6 +33,8 @@
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Executor;
+import jdk.jpackage.test.JavaTool;
 import jdk.jpackage.test.LinuxHelper;
 import static jdk.jpackage.test.TKit.assertTrue;
 import static jdk.jpackage.test.TKit.assertFalse;
@@ -101,9 +102,25 @@ private static PackageTest init(Set<PackageType> types) {
         return new PackageTest()
         .forTypes(types)
         .addInitializer(cmd -> {
-            cmd.addArguments("--runtime-image", Optional.ofNullable(
-                    JPackageCommand.DEFAULT_RUNTIME_IMAGE).orElse(Path.of(
-                            System.getProperty("java.home"))));
+            final Path runtimeImageDir;
+            if (JPackageCommand.DEFAULT_RUNTIME_IMAGE != null) {
+                runtimeImageDir = JPackageCommand.DEFAULT_RUNTIME_IMAGE;
+            } else {
+                runtimeImageDir = TKit.createTempDirectory("runtime").resolve("data");
+
+                new Executor()
+                .setToolProvider(JavaTool.JLINK)
+                .dumpOutput()
+                .addArguments(
+                        "--output", runtimeImageDir.toString(),
+                        "--compress=0",
+                        "--add-modules", "ALL-MODULE-PATH",
+                        "--strip-debug",
+                        "--no-header-files",
+                        "--no-man-pages")
+                .execute();
+            }
+            cmd.addArguments("--runtime-image", runtimeImageDir);
             // Remove --input parameter from jpackage command line as we don't
             // create input directory in the test and jpackage fails
             // if --input references non existant directory.