infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-18 10:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

8346739: jpackage tests failed after JDK-8345259

Browse Source 
Reviewed-by: shade, mchung, asemenyuk
Backport-of: 7ba969a576eb92446e40587fecf98e1e4aba8883
This commit is contained in:
Severin Gehwolf 2025-01-09 10:03:54 +00:00
parent bf45128055
commit c033806b8c
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java
View File

@ -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",

2
test/jdk/tools/jpackage/share/RuntimeImageTest.java
View File

@ -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",

3
test/jdk/tools/jpackage/share/RuntimePackageTest.java
View File

@ -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")