stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8298488: [macos13] tools/jpackage tests failing with "Exit code: 137" on macOS

Browse Source 
Reviewed-by: asemenyuk
This commit is contained in:
Alexander Matveev 2022-12-12 22:51:02 +00:00
parent 0267aa528b
commit 8962c723a8
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
View File

@ -401,7 +401,7 @@ public class MacAppImageBuilder extends AbstractAppImageBuilder {
ENTITLEMENTS.fetchFrom(params));
}
restoreKeychainList(params);
} else if (Platform.isArmMac()) {
} else if (Platform.isMac()) {
signAppBundle(params, root, "-", null, null);
} else {
// Calling signAppBundle() without signingIdentity will result in

4
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
View File

@ -180,10 +180,6 @@ final public class TKit {
return (OS.contains("mac"));
}
public static boolean isArmMac() {
return (isOSX() && "aarch64".equals(System.getProperty("os.arch")));
}
public static boolean isLinux() {
return ((OS.contains("nix") || OS.contains("nux")));
}

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

@ -101,7 +101,7 @@ public class AppContentTest {
})
// On macOS aarch64 we always signing app image and signing will fail, since
// test produces invalid app bundle.
.setExpectedExitCode(testPathArgs.contains(TEST_BAD) || TKit.isArmMac() ? 1 : 0)
.setExpectedExitCode(testPathArgs.contains(TEST_BAD) || TKit.isOSX() ? 1 : 0)
.run();
}
}