archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8252870: Finalize (remove "incubator" from) jpackage

Browse source 
Reviewed-by: kcr, erikj, almatvee, asemenyuk, prr, ihse
This commit is contained in:
Andy Herrick 2020-11-04 20:27:11 +00:00
parent 804bd72599
commit 26e7ef78fb
251 changed files with 396 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/jdk/build/AbsPathsInImage.java
View file

@ -168,12 +168,12 @@ public class AbsPathsInImage {
private void scanFile(Path file, List<byte[]> searchPatterns) throws IOException {
List<String> matches = scanBytes(Files.readAllBytes(file), searchPatterns);
// For the same reason as the *.dll above, the jdk.incubator.jpackage module
// For the same reason as the *.dll above, the jdk.jpackage module
// contains some unavoidable header references in the launcher which is
// stored as a java resource inside the modules file.
if (IS_WINDOWS && file.toString().endsWith("modules")) {
matches = matches.stream()
.filter(f -> !f.matches(".*jdk\\.incubator\\.jpackage.*\\.h.*"))
.filter(f -> !f.matches(".*jdk\\.jpackage.*\\.h.*"))
.collect(Collectors.toList());
}
if (matches.size() > 0) {

2
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
View file

@ -32,7 +32,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.function.BiConsumer;
import java.util.stream.Stream;
import jdk.incubator.jpackage.internal.ApplicationLayout;
import jdk.jpackage.internal.ApplicationLayout;
import jdk.jpackage.test.Functional.ThrowingBiConsumer;
public final class AdditionalLauncher {

2
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java
View file

@ -25,7 +25,7 @@ package jdk.jpackage.test;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
import jdk.incubator.jpackage.internal.IOUtils;
import jdk.jpackage.internal.IOUtils;
final public class FileAssociations {

13
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
View file

@ -46,8 +46,8 @@ import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import jdk.incubator.jpackage.internal.AppImageFile;
import jdk.incubator.jpackage.internal.ApplicationLayout;
import jdk.jpackage.internal.AppImageFile;
import jdk.jpackage.internal.ApplicationLayout;
import jdk.jpackage.test.Functional.ThrowingConsumer;
import jdk.jpackage.test.Functional.ThrowingFunction;
import jdk.jpackage.test.Functional.ThrowingSupplier;
@ -835,15 +835,6 @@ public final class JPackageCommand extends CommandArguments<JPackageCommand> {
}).collect(Collectors.joining(" "));
}
public static Stream<String> filterOutput(Stream<String> jpackageOutput) {
// Skip "WARNING: Using incubator ..." first line of output
return jpackageOutput.skip(1);
}
public static List<String> filterOutput(List<String> jpackageOutput) {
return filterOutput(jpackageOutput.stream()).collect(Collectors.toList());
}
@Override
protected boolean isMutable() {
return !immutable;

2
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java
View file

@ -85,7 +85,7 @@ public final class LauncherIconVerifier {
}
return TKit.SRC_ROOT.resolve(Path.of(components[0],
"classes/jdk/incubator/jpackage/internal/resources", components[1]));
"classes/jdk/jpackage/internal/resources", components[1]));
}
private String launcherName;

2
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
View file

@ -38,7 +38,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import jdk.incubator.jpackage.internal.IOUtils;
import jdk.jpackage.internal.IOUtils;
import jdk.jpackage.test.PackageTest.PackageHandlers;

4
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
View file

@ -43,8 +43,8 @@ import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import jdk.incubator.jpackage.internal.AppImageFile;
import jdk.incubator.jpackage.internal.ApplicationLayout;
import jdk.jpackage.internal.AppImageFile;
import jdk.jpackage.internal.ApplicationLayout;
import jdk.jpackage.test.Functional.ThrowingBiConsumer;
import jdk.jpackage.test.Functional.ThrowingConsumer;
import jdk.jpackage.test.Functional.ThrowingRunnable;

12
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
View file

@ -35,15 +35,15 @@ import java.util.stream.Stream;
*/
public enum PackageType {
WIN_MSI(".msi",
TKit.isWindows() ? "jdk.incubator.jpackage.internal.WinMsiBundler" : null),
TKit.isWindows() ? "jdk.jpackage.internal.WinMsiBundler" : null),
WIN_EXE(".exe",
TKit.isWindows() ? "jdk.incubator.jpackage.internal.WinMsiBundler" : null),
TKit.isWindows() ? "jdk.jpackage.internal.WinMsiBundler" : null),
LINUX_DEB(".deb",
TKit.isLinux() ? "jdk.incubator.jpackage.internal.LinuxDebBundler" : null),
TKit.isLinux() ? "jdk.jpackage.internal.LinuxDebBundler" : null),
LINUX_RPM(".rpm",
TKit.isLinux() ? "jdk.incubator.jpackage.internal.LinuxRpmBundler" : null),
MAC_DMG(".dmg", TKit.isOSX() ? "jdk.incubator.jpackage.internal.MacDmgBundler" : null),
MAC_PKG(".pkg", TKit.isOSX() ? "jdk.incubator.jpackage.internal.MacPkgBundler" : null),
TKit.isLinux() ? "jdk.jpackage.internal.LinuxRpmBundler" : null),
MAC_DMG(".dmg", TKit.isOSX() ? "jdk.jpackage.internal.MacDmgBundler" : null),
MAC_PKG(".pkg", TKit.isOSX() ? "jdk.jpackage.internal.MacPkgBundler" : null),
IMAGE("app-image", null, null);
PackageType(String packageName, String bundleSuffix, String bundlerClass) {

2
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
View file

@ -81,7 +81,7 @@ final public class TKit {
}).get();
public static final Path SRC_ROOT = Functional.identity(() -> {
return TEST_SRC_ROOT.resolve("../../../../src/jdk.incubator.jpackage").normalize().toAbsolutePath();
return TEST_SRC_ROOT.resolve("../../../../src/jdk.jpackage").normalize().toAbsolutePath();
}).get();
public final static String ICON_SUFFIX = Functional.identity(() -> {

2
test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/AppImageFileTest.java → test/jdk/tools/jpackage/junit/jdk/jpackage/internal/AppImageFileTest.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.incubator.jpackage.internal;
package jdk.jpackage.internal;
import java.io.IOException;
import java.nio.file.Files;

2
test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/ApplicationLayoutTest.java → test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ApplicationLayoutTest.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.incubator.jpackage.internal;
package jdk.jpackage.internal;
import java.io.IOException;
import java.nio.file.Files;

2
test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/CompareDottedVersionTest.java → test/jdk/tools/jpackage/junit/jdk/jpackage/internal/CompareDottedVersionTest.java
View file

@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.incubator.jpackage.internal;
package jdk.jpackage.internal;
import java.util.ArrayList;
import java.util.List;

2
test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/DeployParamsTest.java → test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DeployParamsTest.java
View file

@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.incubator.jpackage.internal;
package jdk.jpackage.internal;
import java.nio.file.Path;
import java.io.IOException;

2
test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/DottedVersionTest.java → test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DottedVersionTest.java
View file

@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.incubator.jpackage.internal;
package jdk.jpackage.internal;
import java.util.Collections;
import java.util.List;

2
test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/InvalidDottedVersionTest.java → test/jdk/tools/jpackage/junit/jdk/jpackage/internal/InvalidDottedVersionTest.java
View file

@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.incubator.jpackage.internal;
package jdk.jpackage.internal;
import java.util.List;
import java.util.stream.Collectors;

4
test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/OverridableResourceTest.java → test/jdk/tools/jpackage/junit/jdk/jpackage/internal/OverridableResourceTest.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.incubator.jpackage.internal;
package jdk.jpackage.internal;
import java.io.IOException;
import java.io.InputStream;
@ -33,7 +33,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import jdk.incubator.jpackage.internal.resources.ResourceLocator;
import jdk.jpackage.internal.resources.ResourceLocator;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertArrayEquals;

2
test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/PathGroupTest.java → test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PathGroupTest.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.incubator.jpackage.internal;
package jdk.jpackage.internal;
import java.io.IOException;
import java.nio.file.Files;

6
test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/PlatformVersionTest.java → test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PlatformVersionTest.java
View file

@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.incubator.jpackage.internal;
package jdk.jpackage.internal;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@ -109,9 +109,9 @@ public class PlatformVersionTest {
private final boolean valid;
private final static Function<String, DottedVersion> MAC_CFBUNDLE_VERSION_PARSER = findParser(
"jdk.incubator.jpackage.internal.CFBundleVersion");
"jdk.jpackage.internal.CFBundleVersion");
private final static Function<String, DottedVersion> WIN_MSI_PRODUCT_VERSION_PARSER = findParser(
"jdk.incubator.jpackage.internal.MsiVersion");
"jdk.jpackage.internal.MsiVersion");
private static Function<String, DottedVersion> findParser(String className) {
try {

2
test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/ToolValidatorTest.java → test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ToolValidatorTest.java
View file

@ -22,7 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.incubator.jpackage.internal;
package jdk.jpackage.internal;
import java.nio.file.Path;
import static org.hamcrest.CoreMatchers.is;

2
test/jdk/tools/jpackage/junit/junit.java
View file

@ -27,6 +27,6 @@
* @test
* @summary jpackage unit tests
* @library ${jtreg.home}/lib/junit.jar
* @modules jdk.incubator.jpackage
* @modules jdk.jpackage
* @run shell run_junit.sh
*/

8
test/jdk/tools/jpackage/junit/run_junit.sh
View file

@ -17,10 +17,10 @@ for s in $(find "${TESTSRC}" -name "*.java" | grep -v junit.java); do
done
common_args=(\
--add-modules jdk.incubator.jpackage \
--patch-module jdk.incubator.jpackage="${TESTSRC}${PS}${TESTCLASSES}" \
--add-reads jdk.incubator.jpackage=ALL-UNNAMED \
--add-exports jdk.incubator.jpackage/jdk.incubator.jpackage.internal=ALL-UNNAMED \
--add-modules jdk.jpackage \
--patch-module jdk.jpackage="${TESTSRC}${PS}${TESTCLASSES}" \
--add-reads jdk.jpackage=ALL-UNNAMED \
--add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED \
-classpath "${TESTCLASSPATH}" \
)

2
test/jdk/tools/jpackage/linux/AppCategoryTest.java
View file

@ -47,7 +47,7 @@ import jdk.jpackage.test.PackageType;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=360 -Xmx512m AppCategoryTest
*/
public class AppCategoryTest {

2
test/jdk/tools/jpackage/linux/LicenseTypeTest.java
View file

@ -42,7 +42,7 @@ import jdk.jpackage.test.PackageType;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=360 -Xmx512m LicenseTypeTest
*/
public class LicenseTypeTest {

2
test/jdk/tools/jpackage/linux/LinuxBundleNameTest.java
View file

@ -47,7 +47,7 @@ import jdk.jpackage.test.PackageType;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=360 -Xmx512m LinuxBundleNameTest
*/
public class LinuxBundleNameTest {

2
test/jdk/tools/jpackage/linux/LinuxResourceTest.java
View file

@ -36,7 +36,7 @@ import java.util.List;
* @library ../helpers
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile LinuxResourceTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=LinuxResourceTest

2
test/jdk/tools/jpackage/linux/MaintainerTest.java
View file

@ -43,7 +43,7 @@ import jdk.jpackage.test.TKit;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=360 -Xmx512m MaintainerTest
*/
public class MaintainerTest {

2
test/jdk/tools/jpackage/linux/PackageDepsTest.java
View file

@ -50,7 +50,7 @@ import jdk.jpackage.test.Annotations.Test;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile PackageDepsTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=PackageDepsTest

2
test/jdk/tools/jpackage/linux/ReleaseTest.java
View file

@ -46,7 +46,7 @@ import jdk.jpackage.test.TKit;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=360 -Xmx512m ReleaseTest
*/
public class ReleaseTest {

4
test/jdk/tools/jpackage/linux/ShortcutHintTest.java
View file

@ -58,7 +58,7 @@ import jdk.jpackage.test.Annotations.Test;
* @requires jpackage.test.SQETest == null
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile ShortcutHintTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=ShortcutHintTest
@ -72,7 +72,7 @@ import jdk.jpackage.test.Annotations.Test;
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @requires jpackage.test.SQETest != null
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile ShortcutHintTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=ShortcutHintTest.testBasic

2
test/jdk/tools/jpackage/linux/jdk/jpackage/tests/UsrTreeTest.java
View file

@ -45,7 +45,7 @@ import jdk.jpackage.test.Annotations.Test;
* @requires jpackage.test.SQETest == null
* @requires (os.family == "linux")
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile UsrTreeTest.java
* @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=UsrTreeTest

2
test/jdk/tools/jpackage/macosx/MacFileAssociationsTest.java
View file

@ -41,7 +41,7 @@ import jdk.jpackage.test.MacHelper.PListWrapper;
* @summary jpackage with --file-associations and mac specific file association args
* @library ../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @requires (os.family == "mac")
* @run main/othervm -Xmx512m MacFileAssociationsTest
*/

2
test/jdk/tools/jpackage/macosx/MacPropertiesTest.java
View file

@ -38,7 +38,7 @@ import jdk.jpackage.test.Annotations.Parameter;
* @library ../helpers
* @build jdk.jpackage.test.*
* @requires (os.family == "mac")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile MacPropertiesTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=MacPropertiesTest

2
test/jdk/tools/jpackage/macosx/NameWithSpaceTest.java
View file

@ -40,7 +40,7 @@ import jdk.jpackage.test.Annotations.Test;
* @summary jpackage test with name containing spaces
* @library ../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile NameWithSpaceTest.java
* @requires (os.family == "mac")
* @key jpackagePlatformPackage

2
test/jdk/tools/jpackage/macosx/SigningAppImageTest.java
View file

@ -49,7 +49,7 @@ import jdk.jpackage.test.TKit;
* @build SigningCheck
* @build jtreg.SkippedException
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @requires (os.family == "mac")
* @run main/othervm -Xmx512m SigningAppImageTest
*/

2
test/jdk/tools/jpackage/macosx/SigningPackageTest.java
View file

@ -54,7 +54,7 @@ import jdk.jpackage.test.TKit;
* @build SigningCheck
* @build jtreg.SkippedException
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @requires (os.family == "mac")
* @run main/othervm -Xmx512m SigningPackageTest
*/

2
test/jdk/tools/jpackage/macosx/base/SigningCheck.java
View file

@ -29,7 +29,7 @@ import java.util.stream.Collectors;
import jdk.jpackage.test.TKit;
import jdk.jpackage.test.Executor;
import jdk.incubator.jpackage.internal.MacCertificate;
import jdk.jpackage.internal.MacCertificate;
public class SigningCheck {

4
test/jdk/tools/jpackage/share/AddLauncherTest.java
View file

@ -50,7 +50,7 @@ import jdk.jpackage.test.CfgFile;
* @requires (jpackage.test.SQETest != null)
* @library ../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile AddLauncherTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=AddLauncherTest.test
@ -63,7 +63,7 @@ import jdk.jpackage.test.CfgFile;
* @requires (jpackage.test.SQETest == null)
* @library ../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile AddLauncherTest.java
* @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=AddLauncherTest

2
test/jdk/tools/jpackage/share/AppImagePackageTest.java
View file

@ -45,7 +45,7 @@ import jdk.jpackage.test.Annotations.Test;
* @library ../helpers
* @requires (jpackage.test.SQETest == null)
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile AppImagePackageTest.java
* @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=AppImagePackageTest

2
test/jdk/tools/jpackage/share/ArgumentsTest.java
View file

@ -49,7 +49,7 @@ import jdk.jpackage.test.Annotations.Parameter;
* @summary jpackage create image with --arguments test
* @library ../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile ArgumentsTest.java
* @run main/othervm -Xmx512m jdk.jpackage.test.Main
* --jpt-run=ArgumentsTest

4
test/jdk/tools/jpackage/share/EmptyFolderPackageTest.java
View file

@ -22,7 +22,7 @@
*/
import java.nio.file.Path;
import jdk.incubator.jpackage.internal.ApplicationLayout;
import jdk.jpackage.internal.ApplicationLayout;
import jdk.jpackage.test.PackageTest;
import jdk.jpackage.test.PackageType;
import jdk.jpackage.test.TKit;
@ -39,7 +39,7 @@ import jdk.jpackage.test.TKit;
* @key jpackagePlatformPackage
* @build EmptyFolderBase
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=720 -Xmx512m EmptyFolderPackageTest
*/
public class EmptyFolderPackageTest {

4
test/jdk/tools/jpackage/share/EmptyFolderTest.java
View file

@ -24,7 +24,7 @@
import java.nio.file.Path;
import jdk.jpackage.test.JPackageCommand;
import jdk.jpackage.test.TKit;
import jdk.incubator.jpackage.internal.ApplicationLayout;
import jdk.jpackage.internal.ApplicationLayout;
/**
* Tests generation of app image with input folder containing empty folders.
@ -37,7 +37,7 @@ import jdk.incubator.jpackage.internal.ApplicationLayout;
* @library /test/lib
* @build EmptyFolderBase
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm -Xmx512m EmptyFolderTest
*/
public class EmptyFolderTest {

4
test/jdk/tools/jpackage/share/FileAssociationsTest.java
View file

@ -61,7 +61,7 @@ import jdk.jpackage.test.Annotations.Parameter;
* @key jpackagePlatformPackage
* @requires jpackage.test.SQETest == null
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile FileAssociationsTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=FileAssociationsTest
@ -74,7 +74,7 @@ import jdk.jpackage.test.Annotations.Parameter;
* @key jpackagePlatformPackage
* @requires jpackage.test.SQETest != null
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile FileAssociationsTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=FileAssociationsTest.test

2
test/jdk/tools/jpackage/share/IconTest.java
View file

@ -51,7 +51,7 @@ import jdk.jpackage.test.Annotations.Test;
* @summary jpackage create image and package with custom icons for the main and additional launcher
* @library ../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile IconTest.java
* @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=IconTest

4
test/jdk/tools/jpackage/share/InstallDirTest.java
View file

@ -58,7 +58,7 @@ import jdk.jpackage.test.Annotations.Parameter;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @compile InstallDirTest.java
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=InstallDirTest.testCommon
*/
@ -70,7 +70,7 @@ import jdk.jpackage.test.Annotations.Parameter;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @compile InstallDirTest.java
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @requires (os.family == "linux")
* @requires (jpackage.test.SQETest == null)
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main

4
test/jdk/tools/jpackage/share/LicenseTest.java
View file

@ -67,7 +67,7 @@ import jdk.jpackage.test.TKit;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @compile LicenseTest.java
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=LicenseTest.testCommon
*/
@ -81,7 +81,7 @@ import jdk.jpackage.test.TKit;
* @compile LicenseTest.java
* @requires (os.family == "linux")
* @requires (jpackage.test.SQETest == null)
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=LicenseTest.testCustomDebianCopyright
* --jpt-run=LicenseTest.testCustomDebianCopyrightSubst

2
test/jdk/tools/jpackage/share/MultiLauncherTwoPhaseTest.java
View file

@ -47,7 +47,7 @@ import jdk.jpackage.test.JPackageCommand;
* @library /test/lib
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile MultiLauncherTwoPhaseTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=MultiLauncherTwoPhaseTest

4
test/jdk/tools/jpackage/share/RuntimePackageTest.java
View file

@ -56,7 +56,7 @@ import jdk.jpackage.test.Annotations.Test;
* @comment Temporary disable for OSX until functionality implemented
* @requires (os.family != "mac")
* @requires (jpackage.test.SQETest == null)
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile RuntimePackageTest.java
* @run main/othervm/timeout=1400 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=RuntimePackageTest
@ -71,7 +71,7 @@ import jdk.jpackage.test.Annotations.Test;
* @comment Temporary disable for OSX until functionality implemented
* @requires (os.family != "mac")
* @requires (jpackage.test.SQETest != null)
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile RuntimePackageTest.java
* @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=RuntimePackageTest.test

2
test/jdk/tools/jpackage/share/SimplePackageTest.java
View file

@ -43,7 +43,7 @@ import jdk.jpackage.test.Annotations.Test;
* @library ../helpers
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile SimplePackageTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=SimplePackageTest

6
test/jdk/tools/jpackage/share/jdk/jpackage/tests/AppVersionTest.java
View file

@ -30,13 +30,13 @@ import java.util.List;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import jdk.incubator.jpackage.internal.AppImageFile;
import jdk.jpackage.internal.AppImageFile;
import jdk.jpackage.test.Annotations.Parameters;
import jdk.jpackage.test.Annotations.Test;
import jdk.jpackage.test.JPackageCommand;
import jdk.jpackage.test.PackageTest;
import jdk.jpackage.test.TKit;
import jdk.incubator.jpackage.internal.AppImageFile;
import jdk.jpackage.internal.AppImageFile;
import org.w3c.dom.Document;
/*
@ -44,7 +44,7 @@ import org.w3c.dom.Document;
* @summary jpackage application version testing
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile AppVersionTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.AppVersionTest

2
test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java
View file

@ -48,7 +48,7 @@ import jdk.jpackage.test.Annotations.Parameter;
* @summary jpackage basic testing
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile BasicTest.java
* @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.BasicTest

2
test/jdk/tools/jpackage/share/jdk/jpackage/tests/CookedRuntimeTest.java
View file

@ -44,7 +44,7 @@ import jdk.jpackage.test.TKit;
* @summary test '--runtime-image' option of jpackage
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile CookedRuntimeTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.CookedRuntimeTest

4
test/jdk/tools/jpackage/share/jdk/jpackage/tests/ErrorTest.java
View file

@ -35,7 +35,7 @@ import jdk.jpackage.test.TKit;
* @summary jpackage application version testing
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile ErrorTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.ErrorTest
@ -47,7 +47,7 @@ import jdk.jpackage.test.TKit;
* @summary jpackage application version testing
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile ErrorTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.ErrorTest

4
test/jdk/tools/jpackage/share/jdk/jpackage/tests/JLinkOptionsTest.java
View file

@ -35,7 +35,7 @@ import jdk.jpackage.test.TKit;
* @summary jpackage application version testing
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile JLinkOptionsTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.JLinkOptionsTest
@ -92,7 +92,7 @@ public final class JLinkOptionsTest {
// should have whatever it needs
new String[]{"java.base", "com.other"},
// should not have whatever it doesn't need
new String[]{"jdk.incubator.jpackage"},
new String[]{"jdk.jpackage"},
},
// bind-services and limit-options

4
test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsEqualsTest.java
View file

@ -37,7 +37,7 @@ import jdk.jpackage.test.TKit;
* @summary jpackage create image with --java-options test
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile JavaOptionsEqualsTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.JavaOptionsEqualsTest
@ -49,7 +49,7 @@ import jdk.jpackage.test.TKit;
* @summary jpackage create image with --java-options test
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile JavaOptionsEqualsTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.JavaOptionsEqualsTest

2
test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsTest.java
View file

@ -37,7 +37,7 @@ import jdk.jpackage.test.TKit;
* @summary jpackage create image with --java-options test
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile JavaOptionsTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.JavaOptionsTest

2
test/jdk/tools/jpackage/share/jdk/jpackage/tests/MainClassTest.java
View file

@ -53,7 +53,7 @@ import static jdk.jpackage.tests.MainClassTest.Script.MainClassType.*;
* @summary test different settings of main class name for jpackage
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile MainClassTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.MainClassTest

2
test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest.java
View file

@ -46,7 +46,7 @@ import jdk.jpackage.test.Annotations.Test;
* @summary jpackage with --module-path testing
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile ModulePathTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.ModulePathTest

2
test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest2.java
View file

@ -38,7 +38,7 @@ import jdk.jpackage.test.TKit;
* @summary jpackage with --module-path testing
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile ModulePathTest2.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.ModulePathTest2

6
test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest3.java
View file

@ -32,7 +32,7 @@ import java.util.List;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
import jdk.incubator.jpackage.internal.AppImageFile;
import jdk.jpackage.internal.AppImageFile;
import jdk.jpackage.test.HelloApp;
import jdk.jpackage.test.JavaAppDesc;
import jdk.jpackage.test.Annotations.Test;
@ -51,7 +51,7 @@ import org.w3c.dom.Document;
* @summary jpackage for app's module linked in external runtime
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile ModulePathTest3.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.ModulePathTest3
@ -62,7 +62,7 @@ import org.w3c.dom.Document;
* @summary jpackage for app's module linked in external runtime
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile ModulePathTest3.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.ModulePathTest3

2
test/jdk/tools/jpackage/share/jdk/jpackage/tests/MultipleJarAppTest.java
View file

@ -35,7 +35,7 @@ import jdk.jpackage.test.JPackageCommand;
* @summary jpackage application packed in multiple jars
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile MultipleJarAppTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.MultipleJarAppTest

2
test/jdk/tools/jpackage/share/jdk/jpackage/tests/NonExistentTest.java
View file

@ -35,7 +35,7 @@ import jdk.jpackage.test.TKit;
* @summary jpackage application version testing
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile NonExistentTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=jdk.jpackage.tests.NonExistentTest

2
test/jdk/tools/jpackage/share/jdk/jpackage/tests/UnicodeArgsTest.java
View file

@ -35,7 +35,7 @@ import jdk.jpackage.test.JPackageCommand;
* @summary test how app launcher handles unicode command line arguments
* @library ../../../../helpers
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile UnicodeArgsTest.java
* @requires (os.family == "windows")
* @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main

2
test/jdk/tools/jpackage/windows/WinConsoleTest.java
View file

@ -37,7 +37,7 @@ import jdk.jpackage.test.Annotations.Parameter;
* @library ../helpers
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile WinConsoleTest.java
*
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main

2
test/jdk/tools/jpackage/windows/WinDirChooserTest.java
View file

@ -40,7 +40,7 @@ import jdk.jpackage.test.PackageType;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=360 -Xmx512m WinDirChooserTest
*/

2
test/jdk/tools/jpackage/windows/WinL10nTest.java
View file

@ -42,7 +42,7 @@ import jdk.jpackage.test.Executor;
* @requires (jpackage.test.SQETest == null)
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile WinL10nTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=WinL10nTest

2
test/jdk/tools/jpackage/windows/WinMenuGroupTest.java
View file

@ -43,7 +43,7 @@ import jdk.jpackage.test.Annotations.Test;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile WinMenuGroupTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=WinMenuGroupTest

2
test/jdk/tools/jpackage/windows/WinMenuTest.java
View file

@ -40,7 +40,7 @@ import jdk.jpackage.test.Annotations.Test;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile WinMenuTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=WinMenuTest

2
test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java
View file

@ -41,7 +41,7 @@ import jdk.jpackage.test.Annotations.Test;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile WinPerUserInstallTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=WinPerUserInstallTest

2
test/jdk/tools/jpackage/windows/WinResourceTest.java
View file

@ -42,7 +42,7 @@ import java.util.List;
* @library ../helpers
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile WinResourceTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=WinResourceTest

4
test/jdk/tools/jpackage/windows/WinScriptTest.java
View file

@ -25,7 +25,7 @@ import java.io.IOException;
import java.nio.file.Path;
import java.util.List;
import java.util.ArrayList;
import jdk.incubator.jpackage.internal.IOUtils;
import jdk.jpackage.internal.IOUtils;
import jdk.jpackage.test.TKit;
import jdk.jpackage.test.PackageTest;
import jdk.jpackage.test.PackageType;
@ -40,7 +40,7 @@ import jdk.jpackage.test.JPackageCommand;
* @library ../helpers
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile WinScriptTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=WinScriptTest

2
test/jdk/tools/jpackage/windows/WinShortcutTest.java
View file

@ -41,7 +41,7 @@ import jdk.jpackage.test.Annotations.Test;
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile WinShortcutTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=WinShortcutTest

4
test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java
View file

@ -51,7 +51,7 @@ import jdk.jpackage.test.TKit;
* @requires (jpackage.test.SQETest != null)
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile WinUpgradeUUIDTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=WinUpgradeUUIDTest.test
@ -65,7 +65,7 @@ import jdk.jpackage.test.TKit;
* @requires (jpackage.test.SQETest == null)
* @build jdk.jpackage.test.*
* @requires (os.family == "windows")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @modules jdk.jpackage/jdk.jpackage.internal
* @compile WinUpgradeUUIDTest.java
* @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=WinUpgradeUUIDTest