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

8236518: There is no Native Packages WinUpgradeUUIDTest-2.0.exe after creating Native packages on win

Browse Source 
Reviewed-by: asemenyuk, almatvee
This commit is contained in:
Andy Herrick 2020-05-07 10:54:18 -04:00
parent 1a16a4b628
commit 29f015cf61
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -603,7 +603,7 @@ public final class JPackageCommand extends CommandArguments<JPackageCommand> {
if (isImagePackageType()) {
TKit.deleteDirectoryContentsRecursive(outputDir());
} else if (ThrowingSupplier.toSupplier(() -> Files.deleteIfExists(
} else if (ThrowingSupplier.toSupplier(() -> TKit.deleteIfExists(
outputBundle())).get()) {
TKit.trace(
String.format("Deleted [%s] file before running jpackage",

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

@ -399,6 +399,15 @@ final public class TKit {
private boolean contentsOnly;
}
public static boolean deleteIfExists(Path path) throws IOException {
if (isWindows()) {
if (path.toFile().exists()) {
Files.setAttribute(path, "dos:readonly", false);
}
}
return Files.deleteIfExists(path);
}
/**
* Deletes contents of the given directory recursively. Shortcut for
* <code>deleteDirectoryContentsRecursive(path, null)</code>

15
test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -65,7 +65,7 @@ import jdk.jpackage.test.TKit;
* @requires (jpackage.test.SQETest == null)
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.jpackage/jdk.jpackage.internal
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @compile WinUpgradeUUIDTest.java
* @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=WinUpgradeUUIDTest
@ -79,10 +79,6 @@ public class WinUpgradeUUIDTest {
final UUID upgradeCode = UUID.fromString(
"F0B18E75-52AD-41A2-BC86-6BE4FCD50BEB");
return new PackageTest()
.forTypes(PackageType.WINDOWS)
.configureHelloApp()
.addInitializer(cmd -> cmd.addArguments("--win-upgrade-uuid",
upgradeCode.toString()))
.forTypes(PackageType.WIN_MSI)
.addBundlePropertyVerifier("UpgradeCode", value -> {
if (value.startsWith("{")) {
@ -92,7 +88,12 @@ public class WinUpgradeUUIDTest {
value = value.substring(0, value.length() - 1);
}
return UUID.fromString(value).equals(upgradeCode);
}, "is a match with");
}, "is a match with")
.forTypes(PackageType.WINDOWS)
.configureHelloApp()
.addInitializer(cmd -> cmd.addArguments("--win-upgrade-uuid",
upgradeCode.toString())) ;
};
// Replace real uninstall command for the first package with nop action.