OpenJDK / jdk / jdk
changeset 59724:2f75432d7eb3
8245788: EmptyFolderPackageTest fails on Windows 10
Reviewed-by: herrick, asemenyuk
| author | almatvee |
|---|---|
| date | Wed, 10 Jun 2020 18:18:30 -0400 |
| parents | 560240ab746a |
| children | e0559f61db6b |
| files | test/jdk/tools/jpackage/share/EmptyFolderPackageTest.java |
| diffstat | 1 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/test/jdk/tools/jpackage/share/EmptyFolderPackageTest.java Wed Jun 10 23:40:44 2020 +0200 +++ b/test/jdk/tools/jpackage/share/EmptyFolderPackageTest.java Wed Jun 10 18:18:30 2020 -0400 @@ -24,6 +24,7 @@ import java.nio.file.Path; import jdk.incubator.jpackage.internal.ApplicationLayout; import jdk.jpackage.test.PackageTest; +import jdk.jpackage.test.PackageType; import jdk.jpackage.test.TKit; /** @@ -51,6 +52,13 @@ EmptyFolderBase.createDirStrcture(input); }) .addInstallVerifier(cmd -> { + if (cmd.packageType() == PackageType.WIN_MSI) { + if (cmd.isPackageUnpacked("Not running file " + + "structure check for empty folders")) { + return; + } + } + ApplicationLayout appLayout = cmd.appLayout(); Path appDir = appLayout.appDirectory(); EmptyFolderBase.validateDirStrcture(appDir);