8278970: [macos] SigningPackageTest is failed with runtime exception

Reviewed-by: herrick, asemenyuk
openjdk · Dec 17, 2021 · 36676db · 36676db · openjdk-notifier · Dec 17, 2021
1 parent a5f5d60
commit 36676db
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/test/jdk/tools/jpackage/macosx/SigningPackageTest.java b/test/jdk/tools/jpackage/macosx/SigningPackageTest.java
@@ -76,9 +76,13 @@ private static void verifyDMG(JPackageCommand cmd) {
     private static void verifyAppImageInDMG(JPackageCommand cmd) {
         MacHelper.withExplodedDmg(cmd, dmgImage -> {
             Path launcherPath = dmgImage.resolve(Path.of("Contents", "MacOS", cmd.name()));
-            SigningBase.verifyCodesign(launcherPath, true);
-            SigningBase.verifyCodesign(dmgImage, true);
-            SigningBase.verifySpctl(dmgImage, "exec");
+            // We will be called with all folders in DMG since JDK-8263155, but
+            // we only need to verify app.
+            if (dmgImage.endsWith(cmd.name() + ".app")) {
+                SigningBase.verifyCodesign(launcherPath, true);
+                SigningBase.verifyCodesign(dmgImage, true);
+                SigningBase.verifySpctl(dmgImage, "exec");
+            }
         });
     }