OpenJDK / jdk / jdk
changeset 57460:359553a04f66
8236028: [TESTBUG] Remove dependency of sun.tools.jar from appcds/JarBuilder
Reviewed-by: ccheung
line wrap: on
line diff
--- a/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary At run time, it is OK to append new elements to the classpath that was used at dump time. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @compile test-classes/HelloMore.java * @run driver AppendClasspath
--- a/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary bootclasspath mismatch test. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run driver BootClassPathMismatch */
--- a/test/hotspot/jtreg/runtime/cds/appcds/CaseSensitiveClassPath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/CaseSensitiveClassPath.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * between dump time and archive use time * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @requires os.family != "mac" * @compile test-classes/Hello.java * @run driver CaseSensitiveClassPath
--- a/test/hotspot/jtreg/runtime/cds/appcds/ClassLoaderTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassLoaderTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Initiating and defining classloader test. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @compile test-classes/HelloWB.java * @compile test-classes/ForNameTest.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Class-Path: attribute in MANIFEST file * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @run driver/timeout=240 ClassPathAttr */
--- a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java Mon Dec 16 21:24:00 2019 -0800 @@ -32,7 +32,6 @@ * @summary Test command line flag combinations that * could likely affect the behaviour of AppCDS * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @compile test-classes/Hello.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java Mon Dec 16 21:24:00 2019 -0800 @@ -30,7 +30,6 @@ * execute w/o compressed oops * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run driver CommandLineFlagComboNegative */
--- a/test/hotspot/jtreg/runtime/cds/appcds/DirClasspathTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/DirClasspathTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Handling of directories in -cp is based on the classlist * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @compile test-classes/Super.java * @run driver DirClasspathTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * --patch-module. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/ArrayListTest.java * @run driver DumpClassList */
--- a/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Adding extra symbols into CDS archive using -XX:SharedArchiveConfigFile * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run driver ExtraSymbols */
--- a/test/hotspot/jtreg/runtime/cds/appcds/FieldAnnotationsTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/FieldAnnotationsTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test for field annotations. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/FieldAnnotationsApp.java test-classes/MyAnnotation.java * @run driver FieldAnnotationsTest */
--- a/test/hotspot/jtreg/runtime/cds/appcds/FreeUnusedMetadata.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/FreeUnusedMetadata.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Unused metadata created during dump time should be freed from the CDS archive. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/MethodNoReturn.jasm test-classes/Hello.java * @run driver FreeUnusedMetadata */
--- a/test/hotspot/jtreg/runtime/cds/appcds/GraalWithLimitedMetaspace.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/GraalWithLimitedMetaspace.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,9 +28,6 @@ * VM should not crash but CDS dump will abort upon failure in allocating metaspace. * @requires vm.cds & vm.graal.enabled & vm.compMode == "Xmixed" * @library /test/lib - * @modules java.base/jdk.internal.misc - * java.management - * jdk.jartool/sun.tools.jar * @build UseAppCDS_Test * @run driver ClassFileInstaller -jar test.jar UseAppCDS_Test * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
--- a/test/hotspot/jtreg/runtime/cds/appcds/HelloExtTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/HelloExtTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * (which used to be called the "extension loader) in AppCDS * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/HelloExt.java * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/HelloTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/HelloTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Hello World test for AppCDS * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run driver HelloTest */
--- a/test/hotspot/jtreg/runtime/cds/appcds/IgnoreEmptyClassPaths.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/IgnoreEmptyClassPaths.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test the -XX:+IgnoreEmptyClassPaths flag * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @compile test-classes/HelloMore.java * @run driver IgnoreEmptyClassPaths
--- a/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java Mon Dec 16 21:24:00 2019 -0800 @@ -38,12 +38,14 @@ import java.io.File; import java.nio.file.Path; import java.util.ArrayList; -import sun.tools.jar.Main; +import java.util.spi.ToolProvider; public class JarBuilder { // to turn DEBUG on via command line: -DJarBuilder.DEBUG=[true, TRUE] private static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("JarBuilder.DEBUG", "false")); private static final String classDir = System.getProperty("test.classes"); + private static final ToolProvider JAR = ToolProvider.findFirst("jar") + .orElseThrow(() -> new RuntimeException("ToolProvider for jar not found")); public static String getJarFilePath(String jarName) { return classDir + File.separator + jarName + ".jar"; @@ -196,8 +198,7 @@ private static void createJar(ArrayList<String> args) { if (DEBUG) printIterable("createJar args: ", args); - Main jarTool = new Main(System.out, System.err, "jar"); - if (!jarTool.run(args.toArray(new String[1]))) { + if (JAR.run(System.out, System.err, args.toArray(new String[1])) != 0) { throw new RuntimeException("jar operation failed"); } }
--- a/test/hotspot/jtreg/runtime/cds/appcds/JvmtiAddPath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/JvmtiAddPath.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * @requires vm.cds * @bug 8060592 * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * @compile test-classes/Hello.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test the handling of long path to the classlist file. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run driver LongClassListPath */
--- a/test/hotspot/jtreg/runtime/cds/appcds/MissingSuperTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/MissingSuperTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/MissingSuper.java * @run driver MissingSuperTest */
--- a/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * @requires vm.cds * @requires os.family == "linux" * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run driver MoveJDKTest */
--- a/test/hotspot/jtreg/runtime/cds/appcds/MultiProcessSharing.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/MultiProcessSharing.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * @compile test-classes/MultiProcClass.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test multi-release jar with AppCDS. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @run main/othervm/timeout=2400 MultiReleaseJars */
--- a/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Handling of non-existent classpath elements during dump time and run time * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @compile test-classes/HelloMore.java * @run driver NonExistClasspath
--- a/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * @requires vm.cds * @library /test/lib * @modules java.base/jdk.internal.org.objectweb.asm - * jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run build TestCommon JarBuilder * @run driver OldClassTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/PackageSealing.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/PackageSealing.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary AppCDS handling of package. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/C1.java * @compile test-classes/C2.java * @compile test-classes/PackageSealingTest.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoad2.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoad2.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Load app classes from CDS archive in parallel threads. Similar to ParallelLoad.java, but each class in its own JAR * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/ParallelLoad.java * @compile test-classes/ParallelClasses.java * @run driver ParallelLoad2
--- a/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoadTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoadTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Load app classes from CDS archive in parallel threads * @library /test/lib * @requires vm.cds - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/ParallelLoad.java * @compile test-classes/ParallelClasses.java * @run driver ParallelLoadTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary test the -XX:+PrintSharedArchiveAndExit flag * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @compile test-classes/HelloMore.java * @run main/othervm/timeout=3600 PrintSharedArchiveAndExit
--- a/test/hotspot/jtreg/runtime/cds/appcds/ProhibitedPackage.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/ProhibitedPackage.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary AppCDS handling of prohibited package. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/ProhibitedHelper.java test-classes/Prohibited.jasm * @run driver ProhibitedPackage */
--- a/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary AppCDS handling of protection domain. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/ProtDomain.java * @compile test-classes/ProtDomainB.java * @compile test-classes/JimageClassProtDomain.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/RelativePath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/RelativePath.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test relative paths specified in the -cp. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @compile test-classes/HelloMore.java * @run driver RelativePath
--- a/test/hotspot/jtreg/runtime/cds/appcds/RewriteBytecodesTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/RewriteBytecodesTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * the archived class with the same name is not loaded. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/RewriteBytecodes.java test-classes/Util.java test-classes/Super.java test-classes/Child.java * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary SharedArchiveConsistency * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @compile test-classes/Hello.java * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * w/o a crash. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run main/timeout=240 SharedBaseAddress */
--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary AppCDS handling of package. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/PackageTest.java * @compile test-classes/JimageClassPackage.java * @run driver SharedPackages
--- a/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary AppCDS handling of signed JAR. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run driver SignedJar */
--- a/test/hotspot/jtreg/runtime/cds/appcds/SpecifySysLoaderProp.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/SpecifySysLoaderProp.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary If -Djava.system.class.loader=xxx is specified in command-line, disable archived non-system classes * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/TestClassLoader.java * @compile test-classes/ReportMyLoader.java * @compile test-classes/TrySwitchMyLoader.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java Mon Dec 16 21:24:00 2019 -0800 @@ -31,7 +31,6 @@ * profiler. * @requires vm.hasJFR & vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/MyThread.java * @compile test-classes/TestWithProfilerHelper.java * @run driver TestWithProfiler
--- a/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary ensure -Xlog:class+path showing entire expecting app classpath * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @compile test-classes/Super.java * @run driver TraceLongClasspath
--- a/test/hotspot/jtreg/runtime/cds/appcds/UnusedCPDuringDump.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/UnusedCPDuringDump.java Mon Dec 16 21:24:00 2019 -0800 @@ -30,7 +30,6 @@ * defined to the PlatformClassLoader and AppClassLoader. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run main/othervm -Dtest.cds.copy.child.stdout=false UnusedCPDuringDump */
--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,8 +27,7 @@ * @summary Unverfiable app classes should not be archived. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar - * java.base/jdk.internal.org.objectweb.asm + * @modules java.base/jdk.internal.org.objectweb.asm * @compile test-classes/Greet.java * @compile test-classes/Hi.java * @compile test-classes/VerifierTest0.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,8 +27,7 @@ * @summary Unverfiable app classes should not be archived. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar - * java.base/jdk.internal.org.objectweb.asm + * @modules java.base/jdk.internal.org.objectweb.asm * @compile test-classes/Greet.java * @compile test-classes/Hi.java * @compile test-classes/VerifierTest0.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,8 +27,7 @@ * @summary Unverfiable app classes should not be archived. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar - * java.base/jdk.internal.org.objectweb.asm + * @modules java.base/jdk.internal.org.objectweb.asm * @compile test-classes/Greet.java * @compile test-classes/Hi.java * @compile test-classes/VerifierTest0.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,8 +27,7 @@ * @summary Unverfiable app classes should not be archived. * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar - * java.base/jdk.internal.org.objectweb.asm + * @modules java.base/jdk.internal.org.objectweb.asm * @compile test-classes/Greet.java * @compile test-classes/Hi.java * @compile test-classes/VerifierTest0.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/WideIloadTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/WideIloadTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test 'iload_w' bytecode in shared class * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Iloadw.jasm * @compile test-classes/IloadwMain.java * @run driver WideIloadTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary classpath mismatch between dump time and execution time * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run driver WrongClasspath */
--- a/test/hotspot/jtreg/runtime/cds/appcds/XShareAutoWithChangedJar.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/XShareAutoWithChangedJar.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test -Xshare:auto for AppCDS * @requires vm.cds * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/Hello.java * @run driver XShareAutoWithChangedJar */
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DifferentHeapSizes.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DifferentHeapSizes.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test automatic relocation of archive heap regions dur to heap size changes. * @requires vm.cds.archived.java.heap * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * @bug 8186789 * @requires vm.cds.archived.java.heap * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile MyOuter.java MyException.java * @run driver DumpTimeVerifyFailure */
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/OpenArchiveRegion.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/OpenArchiveRegion.java Mon Dec 16 21:24:00 2019 -0800 @@ -31,7 +31,6 @@ * vm options. * @requires (vm.gc=="null") * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java * @run driver OpenArchiveRegion */
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java * test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java * @run driver ClassListFormatA
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatB.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatB.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java * test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java * @run driver ClassListFormatB
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatC.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatC.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java * test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java * @run driver ClassListFormatC
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java * test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java * @run driver ClassListFormatD
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java * test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java * @run driver ClassListFormatE
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/LoaderSegregation.java * test-classes/CustomLoadee.java test-classes/CustomLoadee2.java * test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestMultiFP.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestMultiFP.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/ParallelLoad.java ../test-classes/ParallelClasses.java * @run driver ParallelTestMultiFP */
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestSingleFP.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestSingleFP.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/ParallelLoad.java ../test-classes/ParallelClasses.java * @run driver ParallelTestSingleFP */
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProhibitedPackageNamesTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProhibitedPackageNamesTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ClassListFormatBase.java ../test-classes/Hello.java test-classes/InProhibitedPkg.java * @run driver ProhibitedPackageNamesTest */
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProtectionDomain.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProtectionDomain.java Mon Dec 16 21:24:00 2019 -0800 @@ -30,7 +30,6 @@ * @requires vm.cds.custom.loaders * * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/ProtDomain.java * @run driver ProtectionDomain */
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -30,7 +30,6 @@ * @requires vm.cds.custom.loaders * * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/CustomLoadee.java * test-classes/CustomLoadee3.java * test-classes/SameNameUnrelatedLoaders.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnintendedLoadersTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnintendedLoadersTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/UnintendedLoaders.java test-classes/CustomLoadee.java * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -30,7 +30,6 @@ * @requires vm.cds.custom.loaders * @requires vm.opt.final.ClassUnloading * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/testlibrary - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox ClassUnloadCommon * @compile test-classes/UnloadUnregisteredLoader.java test-classes/CustomLoadee.java * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnsupportedPlatforms.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnsupportedPlatforms.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Ensure that support for AppCDS custom class loaders are not enabled on unsupported platforms. * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile test-classes/SimpleHello.java * @run driver UnsupportedPlatforms */
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/AppendClasspath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/AppendClasspath.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary At run time, it is OK to append new elements to the classpath that was used at dump time. * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java * @compile ../test-classes/HelloMore.java * @run driver AppendClasspath
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicFlag.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicFlag.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary The DynamicDumpShareSpaces flag is internal, setting it at the command line should have no effect. * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java * @run driver DynamicFlag */
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java Mon Dec 16 21:24:00 2019 -0800 @@ -26,7 +26,6 @@ * @test * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MainModuleOnly
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RelativePath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RelativePath.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test relative paths specified in the -cp. * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java * @compile ../test-classes/HelloMore.java * @run driver RelativePath
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnsupportedBaseArchive.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnsupportedBaseArchive.java Mon Dec 16 21:24:00 2019 -0800 @@ -32,7 +32,6 @@ * @summary unsupported base archive tests * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnusedCPDuringDump.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnusedCPDuringDump.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * defined to the PlatformClassLoader and AppClassLoader. * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java * @run main/othervm -Dtest.cds.copy.child.stdout=false UnusedCPDuringDump */
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ArrayTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ArrayTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary test the ability to archive array classes and load them from the archive * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * @run driver ArrayTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * option for testing the interaction with GC and shared strings. * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @requires vm.cds.archived.java.heap - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * @run driver/timeout=480 GCSharedStringsDuringDump
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Abort dumping if any of the new jigsaw vm options is specified. * @requires vm.cds * @library /test/lib .. - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java * @run driver CheckUnsupportedDumpingOptions */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java Mon Dec 16 21:24:00 2019 -0800 @@ -28,7 +28,6 @@ * * @requires vm.cds & !vm.graal.enabled * @library /test/lib .. - * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java ../test-classes/HelloMore.java * @run driver JigsawOptionsCombo */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/AppClassInCP.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/AppClassInCP.java Mon Dec 16 21:24:00 2019 -0800 @@ -31,7 +31,6 @@ * @library ../.. * @library /test/hotspot/jtreg/testlibrary * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build PatchMain * @run driver AppClassInCP */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/CustomPackage.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/CustomPackage.java Mon Dec 16 21:24:00 2019 -0800 @@ -31,7 +31,6 @@ * @library ../.. * @library /test/hotspot/jtreg/testlibrary * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build PatchMain * @run driver CustomPackage */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/MismatchedPatchModule.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/MismatchedPatchModule.java Mon Dec 16 21:24:00 2019 -0800 @@ -31,7 +31,6 @@ * @library ../.. * @library /test/hotspot/jtreg/testlibrary * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build PatchMain * @run driver MismatchedPatchModule */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchDir.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchDir.java Mon Dec 16 21:24:00 2019 -0800 @@ -30,7 +30,6 @@ * @library ../.. * @library /test/hotspot/jtreg/testlibrary * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build PatchMain * @run driver PatchDir */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchJavaBase.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchJavaBase.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * @library ../.. * @library /test/hotspot/jtreg/testlibrary * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build PatchMain * @run driver PatchJavaBase */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * @library ../.. * @library /test/hotspot/jtreg/testlibrary * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build PatchMain * @run driver Simple */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java Mon Dec 16 21:24:00 2019 -0800 @@ -30,7 +30,6 @@ * @library ../.. * @library /test/hotspot/jtreg/testlibrary * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build PatchMain * @run driver SubClassOfPatchedClass */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/TwoJars.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/TwoJars.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * @library ../.. * @library /test/hotspot/jtreg/testlibrary * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @build PatchMain * @run driver TwoJars */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary AppCDS tests for testing -Xbootclasspath/a * @requires vm.cds & !vm.graal.enabled * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile src/jdk/test/Main.java * @compile src/com/sun/tools/javac/MyMain.jasm * @compile src/sun/nio/cs/ext/MyClass.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @requires vm.cds & !vm.graal.enabled * @library ../.. * @library /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile src/jdk/test/Main.java * @compile src/com/sun/tools/javac/Main.jasm * @compile src/com/sun/tools/javac/MyMain.jasm
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Ensure that classes found in jimage takes precedence over classes found in -Xbootclasspath/a. * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../../test-classes/DummyClassHelper.java * @compile ../../test-classes/java/net/HttpCookie.jasm * @compile ../../../javax/annotation/processing/FilerException.jasm
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java Mon Dec 16 21:24:00 2019 -0800 @@ -32,7 +32,6 @@ * @requires vm.cds & !vm.graal.enabled * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.access - * jdk.jartool/sun.tools.jar * @compile ../../test-classes/EmptyClassHelper.java * @compile ../../test-classes/com/sun/tools/javac/Main.jasm * @run driver EmptyClassInBootClassPath
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java Mon Dec 16 21:24:00 2019 -0800 @@ -26,7 +26,6 @@ * @test * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../../test-classes/Hello.java * @run driver AddModules * @summary sanity test the --add-modules option
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java Mon Dec 16 21:24:00 2019 -0800 @@ -26,7 +26,6 @@ * @test * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @run driver AddOpens * @summary sanity test the --add-opens option */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java Mon Dec 16 21:24:00 2019 -0800 @@ -26,7 +26,6 @@ * @test * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @run driver AddReads * @summary sanity test the --add-reads option */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java Mon Dec 16 21:24:00 2019 -0800 @@ -26,7 +26,6 @@ * @test * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @run driver ExportModule * @summary Tests involve exporting a module from the module path to a jar in the -cp. */
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary JvmtiEnv::AddToBootstrapClassLoaderSearch and JvmtiEnv::AddToSystemClassLoaderSearch should disable AppCDS * @requires vm.cds * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * @compile ../../test-classes/JvmtiApp.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java Mon Dec 16 21:24:00 2019 -0800 @@ -26,7 +26,6 @@ * @test * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MainModuleOnly
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP.java Mon Dec 16 21:24:00 2019 -0800 @@ -26,7 +26,6 @@ * @test * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @run driver ModulePathAndCP * @summary 2 sets of tests: one with only --module-path in the command line; * another with both -cp and --module-path in the command line.
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java Mon Dec 16 21:24:00 2019 -0800 @@ -26,7 +26,6 @@ * @test * @requires vm.hasJFR & vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @run driver/timeout=480 ModulePathAndCP_JFR * @summary Same as ModulePathAndCP, but add -XX:StartFlightRecording=dumponexit=true to the runtime * options. This makes sure that the shared classes are compatible with both
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/OverrideTests.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/OverrideTests.java Mon Dec 16 21:24:00 2019 -0800 @@ -25,7 +25,6 @@ /** * @test * @requires vm.cds - * @modules jdk.jartool/sun.tools.jar * @library ../.. * @library /test/lib * @compile ../../test-classes/Hello.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJvmtiAgent.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJvmtiAgent.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @requires vm.cds * @requires vm.flavor != "minimal" * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @compile ../../test-classes/Hello.java * @run main/othervm/native DumpingWithJvmtiAgent */
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Exercise GC with shared strings * @requires vm.cds.archived.java.heap * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib - * @modules jdk.jartool/sun.tools.jar * @build HelloStringGC sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * @run driver ExerciseGC
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test relevant combinations of command line flags with shared strings * @requires vm.cds.archived.java.heap & vm.hasJFR * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build HelloString * @run driver FlagCombo */ @@ -38,7 +37,6 @@ * @comment A special test excluding the case that requires JFR * @requires vm.cds.archived.java.heap & !vm.hasJFR * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build HelloString * @run driver FlagCombo noJfr */
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java Mon Dec 16 21:24:00 2019 -0800 @@ -37,7 +37,6 @@ * vm options. * @requires (vm.gc=="null") * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @build HelloString @@ -50,7 +49,6 @@ * @requires vm.cds.archived.java.heap * @requires (vm.gc=="null") * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @build HelloString @@ -62,7 +60,6 @@ * @requires vm.cds.archived.java.heap * @requires (vm.gc=="null") * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @build HelloString
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test shared strings together with string intern operation * @requires vm.cds.archived.java.heap * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile InternStringTest.java * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InvalidFileFormat.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InvalidFileFormat.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Check most common errors in file format * @requires vm.cds.archived.java.heap * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build HelloString * @run driver InvalidFileFormat */
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Basic shared string test with large pages * @requires vm.cds.archived.java.heap * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build HelloString * @run driver LargePages */
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockSharedStrings.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockSharedStrings.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Test locking on shared strings * @requires vm.cds.archived.java.heap * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib - * @modules jdk.jartool/sun.tools.jar * @compile LockStringTest.java LockStringValueTest.java * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Basic test for shared strings * @requires vm.cds.archived.java.heap * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib - * @modules jdk.jartool/sun.tools.jar * @build HelloString * @run driver SharedStringsBasic */
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Basic plus test for shared strings * @requires vm.cds.archived.java.heap * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib - * @modules jdk.jartool/sun.tools.jar * @build HelloStringPlus sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * @run driver SharedStringsBasicPlus
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java Mon Dec 16 21:24:00 2019 -0800 @@ -29,7 +29,6 @@ * @requires vm.cds.archived.java.heap * * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib - * @modules jdk.jartool/sun.tools.jar * @build HelloString * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Write a lots of shared strings. * @requires vm.cds.archived.java.heap * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib - * @modules jdk.jartool/sun.tools.jar * @build HelloString * @run driver/timeout=500 SharedStringsStress */
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary White box test for shared strings * @requires vm.cds.archived.java.heap * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox SharedStringsWb * @run driver ClassFileInstaller sun.hotspot.WhiteBox * @run driver SharedStringsWbTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java Tue Dec 17 09:38:30 2019 +0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java Mon Dec 16 21:24:00 2019 -0800 @@ -27,7 +27,6 @@ * @summary Regression test for JDK-8098821 * @bug 8098821 * @requires vm.cds.archived.java.heap - * @modules jdk.jartool/sun.tools.jar * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @run driver SysDictCrash */