infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-07 08:59:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

8356562: SigningAppImageTwoStepsTest test fails

Browse Source 
Reviewed-by: almatvee
This commit is contained in:
Alexey Semenyuk 2025-05-08 22:18:56 +00:00
parent c2a4fa1d83
commit 8a8893ec03
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
View File

@ -1001,12 +1001,8 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
}
private void assertAppImageFile() {
Path appImageDir = Path.of("");
if (isImagePackageType() && hasArgument("--app-image")) {
appImageDir = Path.of(getArgumentValue("--app-image"));
}
final Path lookupPath = AppImageFile.getPathInAppImage(Path.of(""));
final Path lookupPath = AppImageFile.getPathInAppImage(appImageDir);
if (!expectAppImageFile()) {
assertFileNotInAppImage(lookupPath);
} else {
@ -1073,8 +1069,14 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
return;
}
final Path rootDir = isImagePackageType() ? outputBundle() : pathToUnpackedPackageFile(
appInstallationDirectory());
final Path rootDir;
if (TKit.isOSX() && MacHelper.signPredefinedAppImage(this)) {
rootDir = Path.of(getArgumentValue("--app-image"));
} else if (isImagePackageType()) {
rootDir = outputBundle();
} else {
rootDir = pathToUnpackedPackageFile(appInstallationDirectory());
}
try ( Stream<Path> walk = ThrowingSupplier.toSupplier(() -> {
if (TKit.isLinux() && rootDir.equals(Path.of("/"))) {