infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-03 10:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

8236028: [TESTBUG] Remove dependency of sun.tools.jar from appcds/JarBuilder

Browse Source 
Reviewed-by: ccheung
This commit is contained in:
Ioi Lam 2019-12-16 21:24:00 -08:00
parent 31b07b21ae
commit 83cb7044e9
110 changed files with 8 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/CaseSensitiveClassPath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/ClassLoaderTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/DirClasspathTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/FieldAnnotationsTest.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/FreeUnusedMetadata.java
View File

@ -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
*/

3
test/hotspot/jtreg/runtime/cds/appcds/GraalWithLimitedMetaspace.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/HelloExtTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/HelloTest.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/IgnoreEmptyClassPaths.java
View File

@ -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

7
test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java
View File

@ -38,12 +38,14 @@ import jdk.test.lib.process.ProcessTools;
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 @@ public class JarBuilder {
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");
}
}

1
test/hotspot/jtreg/runtime/cds/appcds/JvmtiAddPath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/MissingSuperTest.java
View File

@ -28,7 +28,6 @@
*
* @requires vm.cds
* @library /test/lib
* @modules jdk.jartool/sun.tools.jar
* @compile test-classes/MissingSuper.java
* @run driver MissingSuperTest
*/

1
test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/MultiProcessSharing.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/PackageSealing.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/ParallelLoad2.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/ParallelLoadTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/ProhibitedPackage.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/RelativePath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/RewriteBytecodesTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/SpecifySysLoaderProp.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/UnusedCPDuringDump.java
View File

@ -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
*/

3
test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java
View File

@ -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

3
test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java
View File

@ -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

3
test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java
View File

@ -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

3
test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/WideIloadTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/XShareAutoWithChangedJar.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DifferentHeapSizes.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/cacheObject/OpenArchiveRegion.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatB.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatC.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestMultiFP.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestSingleFP.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProhibitedPackageNamesTest.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProtectionDomain.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnintendedLoadersTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnsupportedPlatforms.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/AppendClasspath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicFlag.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RelativePath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnsupportedBaseArchive.java
View File

@ -32,7 +32,6 @@ import java.nio.file.Paths;
* @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

1
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnusedCPDuringDump.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/javaldr/ArrayTest.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/AppClassInCP.java
View File

@ -31,7 +31,6 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
* @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver AppClassInCP
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/CustomPackage.java
View File

@ -31,7 +31,6 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
* @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver CustomPackage
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/MismatchedPatchModule.java
View File

@ -31,7 +31,6 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
* @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver MismatchedPatchModule
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchDir.java
View File

@ -30,7 +30,6 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
* @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver PatchDir
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchJavaBase.java
View File

@ -29,7 +29,6 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
* @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver PatchJavaBase
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java
View File

@ -29,7 +29,6 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
* @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver Simple
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java
View File

@ -30,7 +30,6 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
* @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver SubClassOfPatchedClass
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/TwoJars.java
View File

@ -29,7 +29,6 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
* @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver TwoJars
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java
View File

@ -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.
*/

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP.java
View File

@ -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.

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java
View File

@ -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

1
test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/OverrideTests.java
View File

@ -25,7 +25,6 @@
/**
* @test
* @requires vm.cds
* @modules jdk.jartool/sun.tools.jar
* @library ../..
* @library /test/lib
* @compile ../../test-classes/Hello.java

1
test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJvmtiAgent.java
View File

@ -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
*/

1
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java
View File

@ -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

2
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java
View File

@ -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
*/

3
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More