Skip to content

Commit c033806

Browse files
committed
8346739: jpackage tests failed after JDK-8345259
Reviewed-by: shade, mchung, asemenyuk Backport-of: 7ba969a
1 parent bf45128 commit c033806

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public class RuntimeImageSymbolicLinksTest {
5151

5252
@Test
5353
public static void test() throws Exception {
54+
final Path jmods = Path.of(System.getProperty("java.home"), "jmods");
5455
final Path workDir = TKit.createTempDirectory("runtime").resolve("data");
5556
final Path jlinkOutputDir = workDir.resolve("temp.runtime");
5657
Files.createDirectories(jlinkOutputDir.getParent());
@@ -61,6 +62,7 @@ public static void test() throws Exception {
6162
.addArguments(
6263
"--output", jlinkOutputDir.toString(),
6364
"--add-modules", "ALL-MODULE-PATH",
65+
"--module-path", jmods.toString(),
6466
"--strip-debug",
6567
"--no-header-files",
6668
"--no-man-pages",

test/jdk/tools/jpackage/share/RuntimeImageTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public class RuntimeImageTest {
4444

4545
@Test
4646
public static void test() throws Exception {
47+
final Path jmods = Path.of(System.getProperty("java.home"), "jmods");
4748
final Path workDir = TKit.createTempDirectory("runtime").resolve("data");
4849
final Path jlinkOutputDir = workDir.resolve("temp.runtime");
4950
Files.createDirectories(jlinkOutputDir.getParent());
@@ -54,6 +55,7 @@ public static void test() throws Exception {
5455
.addArguments(
5556
"--output", jlinkOutputDir.toString(),
5657
"--add-modules", "ALL-MODULE-PATH",
58+
"--module-path", jmods.toString(),
5759
"--strip-debug",
5860
"--no-header-files",
5961
"--no-man-pages",

test/jdk/tools/jpackage/share/RuntimePackageTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ private static PackageTest init(Set<PackageType> types) {
101101
.forTypes(types)
102102
.addInitializer(cmd -> {
103103
final Path runtimeImageDir;
104+
final Path jmods = Path.of(System.getProperty("java.home"), "jmods");
105+
104106
if (JPackageCommand.DEFAULT_RUNTIME_IMAGE != null) {
105107
runtimeImageDir = JPackageCommand.DEFAULT_RUNTIME_IMAGE;
106108
} else {
@@ -112,6 +114,7 @@ private static PackageTest init(Set<PackageType> types) {
112114
.addArguments(
113115
"--output", runtimeImageDir.toString(),
114116
"--add-modules", "ALL-MODULE-PATH",
117+
"--module-path", jmods.toString(),
115118
"--strip-debug",
116119
"--no-header-files",
117120
"--no-man-pages")

0 commit comments

Comments
 (0)