From 1ed3649f480a0342c99d5db3912f0c69cc856dc4 Mon Sep 17 00:00:00 2001 From: Coleen Phillimore Date: Mon, 29 Jul 2019 10:34:20 -0400 Subject: [PATCH] 8202339: [TESTBUG] Consolidate the tests in runtime/SharedArchiveFile and runtime/appcds Add top level cds directory and adjust test groups Reviewed-by: mseledtsov, ccheung --- test/hotspot/jtreg/TEST.groups | 64 +++++++++---------- .../ArchiveDoesNotExist.java | 2 +- .../BootAppendTests.java | 2 +- .../CdsDifferentCompactStrings.java | 2 +- .../CdsDifferentObjectAlignment.java | 2 +- .../CdsSameObjectAlignment.java | 2 +- .../CheckDefaultArchiveFile.java | 0 .../CheckSharingWithDefaultArchive.java | 2 +- .../DumpSharedDictionary.java | 2 +- .../DumpSymbolAndStringTable.java | 2 +- .../{SharedArchiveFile => cds}/LoadClass.java | 2 +- .../MaxMetaspaceSize.java | 2 +- .../NonBootLoaderClasses.java | 0 .../PrintSharedArchiveAndExit.java | 2 +- .../SharedArchiveFile.java | 2 +- .../SharedBaseAddress.java | 2 +- .../SharedStrings.java | 2 +- .../SharedStringsDedup.java | 2 +- .../SharedStringsRunAuto.java | 2 +- .../SharedStringsWb.java | 2 +- .../SharedSymbolTableBucketSize.java | 2 +- .../SpaceUtilizationCheck.java | 0 .../TestInterpreterMethodEntries.java | 0 .../{ => cds}/appcds/AppCDSOptions.java | 2 +- .../{ => cds}/appcds/AppendClasspath.java | 0 .../appcds/BootClassPathMismatch.java | 0 .../runtime/{ => cds}/appcds/CDSandJFR.java | 2 +- .../appcds/CaseSensitiveClassPath.java | 0 .../{ => cds}/appcds/ClassLoaderTest.java | 2 +- .../{ => cds}/appcds/ClassPathAttr.java | 2 +- .../appcds/CommandLineFlagCombo.java | 0 .../appcds/CommandLineFlagComboNegative.java | 0 .../{ => cds}/appcds/CompilerUtils.java | 2 +- .../{ => cds}/appcds/DirClasspathTest.java | 0 .../{ => cds}/appcds/DumpClassList.java | 2 +- .../appcds/ExtraSymbols.invalid_1.txt | 0 .../appcds/ExtraSymbols.invalid_2.txt | 0 .../appcds/ExtraSymbols.invalid_3.txt | 0 .../{ => cds}/appcds/ExtraSymbols.java | 2 +- .../{ => cds}/appcds/ExtraSymbols.symbols.txt | 0 .../appcds/FieldAnnotationsTest.java | 2 +- .../{ => cds}/appcds/FreeUnusedMetadata.java | 2 +- .../appcds/GraalWithLimitedMetaspace.java | 0 .../{ => cds}/appcds/HelloExtTest.java | 2 +- .../runtime/{ => cds}/appcds/HelloTest.java | 2 +- .../appcds/IgnoreEmptyClassPaths.java | 2 +- .../runtime/{ => cds}/appcds/JarBuilder.java | 2 +- .../{ => cds}/appcds/JvmtiAddPath.java | 0 .../{ => cds}/appcds/LongClassListPath.java | 0 .../{ => cds}/appcds/LotsOfClasses.java | 2 +- .../{ => cds}/appcds/MissingSuperTest.java | 2 +- .../runtime/{ => cds}/appcds/MoveJDKTest.java | 2 +- .../{ => cds}/appcds/MultiProcessSharing.java | 2 +- .../{ => cds}/appcds/MultiReleaseJars.java | 2 +- .../{ => cds}/appcds/OldClassTest.java | 2 +- .../{ => cds}/appcds/PackageSealing.java | 0 .../{ => cds}/appcds/ParallelLoad2.java | 2 +- .../{ => cds}/appcds/ParallelLoadTest.java | 2 +- .../appcds/PrintSharedArchiveAndExit.java | 2 +- .../{ => cds}/appcds/ProhibitedPackage.java | 0 .../{ => cds}/appcds/ProtectionDomain.java | 0 .../{ => cds}/appcds/RelativePath.java | 0 .../appcds/RewriteBytecodesTest.java | 2 +- .../appcds/SharedArchiveConsistency.java | 0 .../{ => cds}/appcds/SharedBaseAddress.java | 2 +- .../{ => cds}/appcds/SharedPackages.java | 2 +- .../runtime/{ => cds}/appcds/SignedJar.java | 2 +- .../appcds/SpecifySysLoaderProp.java | 2 +- .../runtime/{ => cds}/appcds/TestCommon.java | 0 .../{ => cds}/appcds/TestWithProfiler.java | 4 +- .../{ => cds}/appcds/TraceLongClasspath.java | 0 .../{ => cds}/appcds/UnusedCPDuringDump.java | 2 +- .../{ => cds}/appcds/UseAppCDS_Test.java | 2 +- .../{ => cds}/appcds/VerifierTest.java | 0 .../{ => cds}/appcds/VerifierTest_0.java | 2 +- .../{ => cds}/appcds/VerifierTest_1A.java | 2 +- .../{ => cds}/appcds/VerifierTest_1B.java | 2 +- .../{ => cds}/appcds/VerifierTest_2.java | 2 +- .../{ => cds}/appcds/WideIloadTest.java | 2 +- .../{ => cds}/appcds/WrongClasspath.java | 0 .../appcds/XShareAutoWithChangedJar.java | 2 +- .../cacheObject/ArchivedIntegerCacheTest.java | 4 +- .../cacheObject/ArchivedModuleComboTest.java | 4 +- .../ArchivedModuleCompareTest.java | 4 +- .../ArchivedModuleWithCustomImageTest.java | 4 +- .../cacheObject/CheckArchivedModuleApp.java | 2 +- .../cacheObject/CheckCachedMirrorApp.java | 2 +- .../cacheObject/CheckCachedMirrorTest.java | 4 +- .../CheckCachedResolvedReferences.java | 4 +- .../CheckCachedResolvedReferencesApp.java | 2 +- .../cacheObject/CheckIntegerCacheApp.java | 2 +- .../cacheObject/DifferentHeapSizes.java | 4 +- .../DumpTimeVerifyFailure.config.txt | 0 .../cacheObject/DumpTimeVerifyFailure.java | 4 +- .../appcds/cacheObject/GCStress.config.txt | 0 .../appcds/cacheObject/GCStressApp.java | 2 +- .../appcds/cacheObject/GCStressTest.java | 4 +- .../cacheObject/InstrumentationAgent.mf | 0 .../MirrorWithReferenceFieldsApp.java | 2 +- .../MirrorWithReferenceFieldsTest.java | 4 +- .../appcds/cacheObject/MyException.java | 2 +- .../{ => cds}/appcds/cacheObject/MyOuter.java | 2 +- .../appcds/cacheObject/OpenArchiveRegion.java | 4 +- .../appcds/cacheObject/PrimitiveTypesApp.java | 2 +- .../cacheObject/PrimitiveTypesTest.java | 4 +- .../cacheObject/PrintSystemModulesApp.java | 2 +- .../appcds/cacheObject/RedefineClassApp.java | 2 +- .../appcds/cacheObject/RedefineClassTest.java | 4 +- .../cacheObject/src/test/jdk/test/Test.java | 2 +- .../cacheObject/src/test/module-info.java | 2 +- .../appcds/cdsutils/DynamicDumpHelper.java | 0 .../{ => cds}/appcds/condy/CondyHello.jasm | 2 +- .../{ => cds}/appcds/condy/CondyHelloApp.java | 2 +- .../appcds/condy/CondyHelloTest.java | 4 +- .../appcds/customLoader/ClassListFormatA.java | 2 +- .../appcds/customLoader/ClassListFormatB.java | 2 +- .../customLoader/ClassListFormatBase.java | 2 +- .../appcds/customLoader/ClassListFormatC.java | 2 +- .../appcds/customLoader/ClassListFormatD.java | 2 +- .../appcds/customLoader/ClassListFormatE.java | 2 +- .../appcds/customLoader/CustomLoaderApp.java | 2 +- .../appcds/customLoader/HelloCustom.java | 2 +- .../appcds/customLoader/HelloCustom_JFR.java | 2 +- .../customLoader/LoaderSegregationTest.java | 4 +- .../appcds/customLoader/ParallelTestBase.java | 2 +- .../customLoader/ParallelTestMultiFP.java | 4 +- .../customLoader/ParallelTestSingleFP.java | 4 +- .../ProhibitedPackageNamesTest.java | 2 +- .../appcds/customLoader/ProtectionDomain.java | 4 +- .../SameNameInTwoLoadersTest.java | 4 +- .../customLoader/UnintendedLoadersTest.java | 4 +- .../UnloadUnregisteredLoaderTest.java | 4 +- .../customLoader/UnsupportedPlatforms.java | 4 +- .../test-classes/CustomInterface2_ia.java | 2 +- .../test-classes/CustomInterface2_ib.java | 2 +- .../test-classes/CustomLoadee.java | 2 +- .../test-classes/CustomLoadee2.java | 2 +- .../test-classes/CustomLoadee3.java | 2 +- .../test-classes/CustomLoadee3Child.java | 2 +- .../customLoader/test-classes/Hello.java | 2 +- .../test-classes/HelloUnload.java | 0 .../test-classes/InProhibitedPkg.java | 2 +- .../customLoader/test-classes/LoaderAPI.mf | 0 .../test-classes/LoaderSegregation.java | 2 +- .../test-classes/OnlyBuiltin.java | 2 +- .../test-classes/OnlyUnregistered.java | 2 +- .../customLoader/test-classes/ProtDomain.java | 2 +- .../SameNameUnrelatedLoaders.java | 2 +- .../test-classes/SimpleHello.java | 2 +- .../test-classes/UnintendedLoaders.java | 2 +- .../UnloadUnregisteredLoader.java | 2 +- .../dynamicArchive/AppendClasspath.java | 2 +- .../dynamicArchive/ArchiveConsistency.java | 2 +- .../appcds/dynamicArchive/ArrayKlasses.java | 4 +- .../ClassResolutionFailure.java | 2 +- .../DynamicArchiveTestBase.java | 2 +- .../appcds/dynamicArchive/DynamicFlag.java | 2 +- .../dynamicArchive/DynamicLotsOfClasses.java | 2 +- .../dynamicArchive/ExcludedClasses.java | 4 +- .../appcds/dynamicArchive/HelloDynamic.java | 2 +- .../dynamicArchive/HelloDynamicCustom.java | 2 +- .../HelloDynamicCustomUnload.java | 2 +- .../appcds/dynamicArchive/JITInteraction.java | 2 +- .../appcds/dynamicArchive/MainModuleOnly.java | 2 +- .../appcds/dynamicArchive/MethodSorting.java | 4 +- .../appcds/dynamicArchive/MissingArchive.java | 2 +- .../dynamicArchive/NoClassToArchive.java | 2 +- .../appcds/dynamicArchive/RelativePath.java | 2 +- .../SharedArchiveFileOption.java | 2 +- .../UnsupportedBaseArchive.java | 2 +- .../dynamicArchive/UnusedCPDuringDump.java | 2 +- .../dynamicArchive/WrongTopClasspath.java | 2 +- .../test-classes/ArrayKlassesApp.java | 0 .../test-classes/ExcludedClassesApp.java | 0 .../test-classes/LoadClasses.java | 0 .../test-classes/MethodSortingApp.java | 0 .../test-classes/MissingDependent.java | 0 .../test-classes/StrConcatApp.java | 0 .../dynamicArchive/test-classes/TestJIT.java | 0 .../javaldr/AnonVmClassesDuringDump.java | 4 +- .../AnonVmClassesDuringDumpTransformer.java | 2 +- .../AnonVmClassesDuringDumpTransformer.mf | 0 .../{ => cds}/appcds/javaldr/ArrayTest.java | 4 +- .../appcds/javaldr/ArrayTestHelper.java | 2 +- .../appcds/javaldr/GCDuringDump.java | 4 +- .../javaldr/GCDuringDumpTransformer.java | 2 +- .../appcds/javaldr/GCDuringDumpTransformer.mf | 0 .../javaldr/GCSharedStringsDuringDump.java | 4 +- .../javaldr/GCSharedStringsDuringDumpWb.java | 2 +- .../appcds/javaldr/HumongousDuringDump.java | 4 +- .../HumongousDuringDumpTransformer.java | 2 +- .../javaldr/HumongousDuringDumpTransformer.mf | 0 .../CheckUnsupportedDumpingOptions.java | 2 +- .../appcds/jigsaw/JigsawOptionsCombo.java | 2 +- .../jigsaw/PatchModule/AppClassInCP.java | 2 +- .../jigsaw/PatchModule/CustomPackage.java | 2 +- .../PatchModule/MismatchedPatchModule.java | 0 .../appcds/jigsaw/PatchModule/PatchDir.java | 2 +- .../jigsaw/PatchModule/PatchJavaBase.java | 0 .../appcds/jigsaw/PatchModule/PatchMain.java | 0 .../appcds/jigsaw/PatchModule/Simple.java | 2 +- .../PatchModule/SubClassOfPatchedClass.java | 2 +- .../appcds/jigsaw/PatchModule/TwoJars.java | 2 +- .../classpathtests/BootAppendTests.java | 4 +- .../jigsaw/classpathtests/ClassPathTests.java | 4 +- .../DummyClassesInBootClassPath.java | 4 +- .../EmptyClassInBootClassPath.java | 4 +- .../src/com/sun/tools/javac/Main.jasm | 2 +- .../src/com/sun/tools/javac/MyMain.jasm | 2 +- .../classpathtests/src/jdk/test/Main.java | 2 +- .../src/sun/nio/cs/ext/MyClass.java | 2 +- .../src/sun/nio/cs/ext1/MyClass.java | 2 +- .../appcds/jigsaw/modulepath/AddModules.java | 2 +- .../appcds/jigsaw/modulepath/AddOpens.java | 4 +- .../appcds/jigsaw/modulepath/AddReads.java | 2 +- .../jigsaw/modulepath/ExportModule.java | 4 +- .../jigsaw/modulepath/JvmtiAddPath.java | 2 +- .../jigsaw/modulepath/MainModuleOnly.java | 2 +- .../jigsaw/modulepath/ModulePathAndCP.java | 2 +- .../modulepath/ModulePathAndCP_JFR.java | 2 +- .../src/com.greetings/com/greetings/Main.java | 2 +- .../src/com.greetings/module-info.java | 2 +- .../src/com.hello/com/hello/Main.java | 2 +- .../modulepath/src/com.hello/module-info.java | 2 +- .../src/com.nomodule/com/nomodule/Main.java | 2 +- .../com.norequires/com/norequires/Main.java | 2 +- .../src/com.norequires/module-info.java | 2 +- .../src/com.simple/com/simple/Main.java | 2 +- .../src/com.simple/module-info.java | 2 +- .../modulepath/src/org.astro/module-info.java | 2 +- .../src/org.astro/org/astro/World.java | 2 +- .../jigsaw/overridetests/OverrideTests.java | 0 .../java/net/http/HttpTimeoutException.java | 2 +- .../src/java.net.http/module-info.java | 2 +- .../com/sun/tools/javac/Main.java | 2 +- .../src/jdk.compiler/module-info.java | 2 +- .../overridetests/src/test/jdk/test/Main.java | 2 +- .../overridetests/src/test/module-info.java | 2 +- .../appcds/jvmti/ClassFileLoadHook.java | 0 .../appcds/jvmti/ClassFileLoadHookTest.java | 2 +- .../appcds/jvmti/InstrumentationAgent.mf | 0 .../appcds/jvmti/InstrumentationApp.java | 0 .../InstrumentationClassFileTransformer.java | 4 +- ...mentationRegisterClassFileTransformer.java | 2 +- .../appcds/jvmti/InstrumentationTest.java | 6 +- .../DumpingWithJavaAgent.java | 2 +- .../DumpingWithJvmtiAgent.java | 4 +- .../jvmti/dumpingWithAgent/SimpleAgent.java | 2 +- .../jvmti/dumpingWithAgent/SimpleAgent.mf | 0 .../libAddToSystemCLSearchOnLoad.c | 2 +- .../ParallelClassesTransform.java | 2 +- .../ParallelLoadAndTransformTest.java | 8 +-- .../TransformInterfaceImplementorAppCDS.java | 14 ++-- .../TransformRelatedClassesAppCDS.java | 2 +- .../TransformSuperSubAppCDS.java | 14 ++-- .../appcds/redefineClass/RedefineBasic.java | 2 +- .../redefineClass/RedefineBasicTest.java | 2 +- .../RedefineRunningMethods_Shared.java | 2 +- .../RedefineRunningMethods_SharedHelper.java | 2 +- .../appcds/sharedStrings/ExerciseGC.java | 4 +- .../appcds/sharedStrings/ExtraSharedInput.txt | 0 .../appcds/sharedStrings/FlagCombo.java | 6 +- .../appcds/sharedStrings/HelloString.java | 2 +- .../appcds/sharedStrings/HelloStringGC.java | 2 +- .../appcds/sharedStrings/HelloStringPlus.java | 0 .../sharedStrings/IncompatibleOptions.java | 8 +-- .../sharedStrings/InternSharedString.java | 4 +- .../sharedStrings/InternStringTest.java | 2 +- .../sharedStrings/InvalidFileFormat.java | 4 +- .../appcds/sharedStrings/LargePages.java | 4 +- .../sharedStrings/LockSharedStrings.java | 4 +- .../appcds/sharedStrings/LockStringTest.java | 0 .../sharedStrings/LockStringValueTest.java | 2 +- .../sharedStrings/SharedStringsBasic.java | 4 +- .../sharedStrings/SharedStringsBasic.txt | 0 .../sharedStrings/SharedStringsBasicPlus.java | 4 +- .../sharedStrings/SharedStringsHumongous.java | 4 +- .../sharedStrings/SharedStringsStress.java | 4 +- .../sharedStrings/SharedStringsUtils.java | 2 +- .../appcds/sharedStrings/SharedStringsWb.java | 2 +- .../sharedStrings/SharedStringsWbTest.java | 4 +- .../appcds/sharedStrings/SysDictCrash.java | 2 +- .../invalidFormat/CorruptDataLine.txt | 0 .../invalidFormat/InvalidDataType.txt | 0 .../invalidFormat/InvalidHeader.txt | 0 .../invalidFormat/InvalidString.txt | 0 .../invalidFormat/InvalidStringFormat.txt | 0 .../invalidFormat/InvalidSymbol.txt | 0 .../invalidFormat/InvalidSymbolFormat.txt | 0 .../invalidFormat/InvalidVersion.txt | 0 .../invalidFormat/LengthOverflow.txt | 0 .../invalidFormat/OverflowPrefix.txt | 0 .../invalidFormat/TruncatedString.txt | 0 .../invalidFormat/UnrecognizedPrefix.txt | 0 .../appcds/test-classes/ArrayListTest.java | 2 +- .../BootClassPathAppendHelper.java | 2 +- .../{ => cds}/appcds/test-classes/C1.java | 2 +- .../{ => cds}/appcds/test-classes/C2.java | 2 +- .../{ => cds}/appcds/test-classes/Child.java | 2 +- .../appcds/test-classes/CpAttr1.java | 2 +- .../appcds/test-classes/CpAttr2.java | 2 +- .../appcds/test-classes/CpAttr3.java | 2 +- .../appcds/test-classes/CpAttr4.java | 2 +- .../appcds/test-classes/CpAttr5.java | 2 +- .../appcds/test-classes/DummyClassHelper.java | 0 .../appcds/test-classes/EmptyClassHelper.java | 2 +- .../test-classes/FieldAnnotationsApp.java | 2 +- .../appcds/test-classes/ForNameTest.java | 2 +- .../appcds/test-classes/GenericTestApp.java | 0 .../test-classes/GetFlightRecorder.java | 2 +- .../{ => cds}/appcds/test-classes/Greet.java | 2 +- .../{ => cds}/appcds/test-classes/Hello.java | 2 +- .../appcds/test-classes/HelloExt.java | 2 +- .../appcds/test-classes/HelloExtApp.java | 2 +- .../appcds/test-classes/HelloExtExt.java | 2 +- .../appcds/test-classes/HelloMore.java | 2 +- .../appcds/test-classes/HelloWB.java | 2 +- .../{ => cds}/appcds/test-classes/Hi.java | 2 +- .../{ => cds}/appcds/test-classes/Iloadw.jasm | 2 +- .../appcds/test-classes/IloadwMain.java | 2 +- .../test-classes/JimageClassPackage.java | 2 +- .../test-classes/JimageClassProtDomain.java | 2 +- .../appcds/test-classes/JvmtiApp.java | 2 +- .../appcds/test-classes/MethodNoReturn.jasm | 2 +- .../appcds/test-classes/MissingSuper.java | 2 +- .../appcds/test-classes/MultiProcClass.java | 2 +- .../appcds/test-classes/MyAnnotation.java | 2 +- .../appcds/test-classes/MyThread.java | 2 +- .../test-classes/PackageSealingTest.java | 2 +- .../appcds/test-classes/PackageTest.java | 2 +- .../appcds/test-classes/ParallelClasses.java | 2 +- .../appcds/test-classes/ParallelLoad.java | 2 +- .../appcds/test-classes/Prohibited.jasm | 2 +- .../appcds/test-classes/ProhibitedHelper.java | 2 +- .../appcds/test-classes/ProtDomain.java | 2 +- .../appcds/test-classes/ProtDomainB.java | 2 +- .../appcds/test-classes/ReportMyLoader.java | 2 +- .../appcds/test-classes/RewriteBytecodes.java | 2 +- .../{ => cds}/appcds/test-classes/Super.java | 2 +- .../appcds/test-classes/TestClassLoader.java | 2 +- .../test-classes/TestWithProfilerHelper.java | 2 +- .../test-classes/TrySwitchMyLoader.java | 2 +- .../{ => cds}/appcds/test-classes/Util.java | 2 +- .../appcds/test-classes/VerifierTest0.java | 2 +- .../com/sun/tools/javac/Main.jasm | 2 +- .../{ => cds}/appcds/test-classes/cpattr1.mf | 0 .../appcds/test-classes/cpattr1_long.mf | 0 .../{ => cds}/appcds/test-classes/cpattr2.mf | 0 .../{ => cds}/appcds/test-classes/cpattr3.mf | 0 .../{ => cds}/appcds/test-classes/cpattr4.mf | 0 .../appcds/test-classes/cpattr5_extra_long.mf | 0 .../test-classes/java/net/HttpCookie.jasm | 2 +- .../InvalidTransactionException.jasm | 2 +- .../appcds/test-classes/package_seal.mf | 0 .../annotation/processing/FilerException.jasm | 2 +- .../javax/sound/sampled/MyClass.jasm | 2 +- .../nonjdk/myPackage/MyClass.java | 2 +- .../ReplaceCriticalClasses.java | 0 .../ReplaceCriticalClassesForSubgraphs.java | 2 +- .../transformRelatedClasses/Implementor.java | 2 +- .../transformRelatedClasses/Interface.java | 2 +- .../transformRelatedClasses/SubClass.java | 2 +- .../transformRelatedClasses/SuperClazz.java | 2 +- .../transformRelatedClasses/TestEntry.java | 2 +- .../TransformInterfaceAndImplementor.java | 4 +- .../TransformRelatedClasses.java | 2 +- .../TransformSuperAndSubClasses.java | 4 +- .../TransformSuperSubTwoPckgs.java | 4 +- .../TransformTestCommon.java | 2 +- .../myPkg1/SuperClazz.java | 2 +- .../myPkg2/SubClass.java | 2 +- 371 files changed, 398 insertions(+), 402 deletions(-) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/ArchiveDoesNotExist.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/BootAppendTests.java (99%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/CdsDifferentCompactStrings.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/CdsDifferentObjectAlignment.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/CdsSameObjectAlignment.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/CheckDefaultArchiveFile.java (100%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/CheckSharingWithDefaultArchive.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/DumpSharedDictionary.java (98%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/DumpSymbolAndStringTable.java (98%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/LoadClass.java (94%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/MaxMetaspaceSize.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/NonBootLoaderClasses.java (100%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/PrintSharedArchiveAndExit.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/SharedArchiveFile.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/SharedBaseAddress.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/SharedStrings.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/SharedStringsDedup.java (96%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/SharedStringsRunAuto.java (96%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/SharedStringsWb.java (96%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/SharedSymbolTableBucketSize.java (97%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/SpaceUtilizationCheck.java (100%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/TestInterpreterMethodEntries.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/AppCDSOptions.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/AppendClasspath.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/BootClassPathMismatch.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/CDSandJFR.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/CaseSensitiveClassPath.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ClassLoaderTest.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ClassPathAttr.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/CommandLineFlagCombo.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/CommandLineFlagComboNegative.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/CompilerUtils.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/DirClasspathTest.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/DumpClassList.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ExtraSymbols.invalid_1.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ExtraSymbols.invalid_2.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ExtraSymbols.invalid_3.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ExtraSymbols.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ExtraSymbols.symbols.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/FieldAnnotationsTest.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/FreeUnusedMetadata.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/GraalWithLimitedMetaspace.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/HelloExtTest.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/HelloTest.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/IgnoreEmptyClassPaths.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/JarBuilder.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/JvmtiAddPath.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/LongClassListPath.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/LotsOfClasses.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/MissingSuperTest.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/MoveJDKTest.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/MultiProcessSharing.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/MultiReleaseJars.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/OldClassTest.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/PackageSealing.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ParallelLoad2.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ParallelLoadTest.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/PrintSharedArchiveAndExit.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ProhibitedPackage.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/ProtectionDomain.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/RelativePath.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/RewriteBytecodesTest.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/SharedArchiveConsistency.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/SharedBaseAddress.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/SharedPackages.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/SignedJar.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/SpecifySysLoaderProp.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/TestCommon.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/TestWithProfiler.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/TraceLongClasspath.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/UnusedCPDuringDump.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/UseAppCDS_Test.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/VerifierTest.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/VerifierTest_0.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/VerifierTest_1A.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/VerifierTest_1B.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/VerifierTest_2.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/WideIloadTest.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/WrongClasspath.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/XShareAutoWithChangedJar.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/ArchivedIntegerCacheTest.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/ArchivedModuleComboTest.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/ArchivedModuleCompareTest.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/CheckArchivedModuleApp.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/CheckCachedMirrorApp.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/CheckCachedMirrorTest.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/CheckCachedResolvedReferences.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/CheckCachedResolvedReferencesApp.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/CheckIntegerCacheApp.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/DifferentHeapSizes.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/DumpTimeVerifyFailure.config.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/DumpTimeVerifyFailure.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/GCStress.config.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/GCStressApp.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/GCStressTest.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/InstrumentationAgent.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/MirrorWithReferenceFieldsApp.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/MirrorWithReferenceFieldsTest.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/MyException.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/MyOuter.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/OpenArchiveRegion.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/PrimitiveTypesApp.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/PrimitiveTypesTest.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/PrintSystemModulesApp.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/RedefineClassApp.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/RedefineClassTest.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/src/test/jdk/test/Test.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cacheObject/src/test/module-info.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/cdsutils/DynamicDumpHelper.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/condy/CondyHello.jasm (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/condy/CondyHelloApp.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/condy/CondyHelloTest.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ClassListFormatA.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ClassListFormatB.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ClassListFormatBase.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ClassListFormatC.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ClassListFormatD.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ClassListFormatE.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/CustomLoaderApp.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/HelloCustom.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/HelloCustom_JFR.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/LoaderSegregationTest.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ParallelTestBase.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ParallelTestMultiFP.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ParallelTestSingleFP.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ProhibitedPackageNamesTest.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/ProtectionDomain.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/SameNameInTwoLoadersTest.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/UnintendedLoadersTest.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/UnloadUnregisteredLoaderTest.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/UnsupportedPlatforms.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/CustomInterface2_ia.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/CustomInterface2_ib.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/CustomLoadee.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/CustomLoadee2.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/CustomLoadee3.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/CustomLoadee3Child.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/Hello.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/HelloUnload.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/InProhibitedPkg.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/LoaderAPI.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/LoaderSegregation.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/OnlyBuiltin.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/OnlyUnregistered.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/ProtDomain.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/SameNameUnrelatedLoaders.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/SimpleHello.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/UnintendedLoaders.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/customLoader/test-classes/UnloadUnregisteredLoader.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/AppendClasspath.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/ArchiveConsistency.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/ArrayKlasses.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/ClassResolutionFailure.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/DynamicArchiveTestBase.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/DynamicFlag.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/DynamicLotsOfClasses.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/ExcludedClasses.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/HelloDynamic.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/HelloDynamicCustom.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/HelloDynamicCustomUnload.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/JITInteraction.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/MainModuleOnly.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/MethodSorting.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/MissingArchive.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/NoClassToArchive.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/RelativePath.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/SharedArchiveFileOption.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/UnsupportedBaseArchive.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/UnusedCPDuringDump.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/WrongTopClasspath.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/test-classes/ArrayKlassesApp.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/test-classes/ExcludedClassesApp.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/test-classes/LoadClasses.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/test-classes/MethodSortingApp.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/test-classes/MissingDependent.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/test-classes/StrConcatApp.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/dynamicArchive/test-classes/TestJIT.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/AnonVmClassesDuringDump.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/AnonVmClassesDuringDumpTransformer.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/AnonVmClassesDuringDumpTransformer.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/ArrayTest.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/ArrayTestHelper.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/GCDuringDump.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/GCDuringDumpTransformer.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/GCDuringDumpTransformer.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/GCSharedStringsDuringDump.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/GCSharedStringsDuringDumpWb.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/HumongousDuringDump.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/HumongousDuringDumpTransformer.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/javaldr/HumongousDuringDumpTransformer.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/CheckUnsupportedDumpingOptions.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/JigsawOptionsCombo.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/PatchModule/AppClassInCP.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/PatchModule/CustomPackage.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/PatchModule/MismatchedPatchModule.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/PatchModule/PatchDir.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/PatchModule/PatchJavaBase.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/PatchModule/PatchMain.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/PatchModule/Simple.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/PatchModule/TwoJars.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/classpathtests/BootAppendTests.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/classpathtests/ClassPathTests.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/Main.jasm (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/MyMain.jasm (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/classpathtests/src/jdk/test/Main.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext/MyClass.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext1/MyClass.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/AddModules.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/AddOpens.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/AddReads.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/ExportModule.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/JvmtiAddPath.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/MainModuleOnly.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/ModulePathAndCP.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/com.greetings/module-info.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/com.hello/module-info.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/com.norequires/module-info.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/com.simple/module-info.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/org.astro/module-info.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/overridetests/OverrideTests.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/overridetests/src/java.net.http/java/net/http/HttpTimeoutException.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/overridetests/src/java.net.http/module-info.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/overridetests/src/jdk.compiler/com/sun/tools/javac/Main.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/overridetests/src/jdk.compiler/module-info.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/overridetests/src/test/jdk/test/Main.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jigsaw/overridetests/src/test/module-info.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/ClassFileLoadHook.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/ClassFileLoadHookTest.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/InstrumentationAgent.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/InstrumentationApp.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/InstrumentationClassFileTransformer.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/InstrumentationRegisterClassFileTransformer.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/InstrumentationTest.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/dumpingWithAgent/DumpingWithJvmtiAgent.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/dumpingWithAgent/SimpleAgent.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/dumpingWithAgent/SimpleAgent.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/dumpingWithAgent/libAddToSystemCLSearchOnLoad.c (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/parallelLoad/ParallelClassesTransform.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java (90%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java (71%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/transformRelatedClasses/TransformRelatedClassesAppCDS.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java (71%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/redefineClass/RedefineBasic.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/redefineClass/RedefineBasicTest.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/redefineClass/RedefineRunningMethods_Shared.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/redefineClass/RedefineRunningMethods_SharedHelper.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/ExerciseGC.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/ExtraSharedInput.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/FlagCombo.java (92%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/HelloString.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/HelloStringGC.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/HelloStringPlus.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/IncompatibleOptions.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/InternSharedString.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/InternStringTest.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/InvalidFileFormat.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/LargePages.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/LockSharedStrings.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/LockStringTest.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/LockStringValueTest.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/SharedStringsBasic.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/SharedStringsBasic.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/SharedStringsBasicPlus.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/SharedStringsHumongous.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/SharedStringsStress.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/SharedStringsUtils.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/SharedStringsWb.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/SharedStringsWbTest.java (93%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/SysDictCrash.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/CorruptDataLine.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/InvalidDataType.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/InvalidHeader.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/InvalidString.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/InvalidStringFormat.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/InvalidSymbol.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/InvalidSymbolFormat.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/InvalidVersion.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/LengthOverflow.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/OverflowPrefix.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/TruncatedString.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/sharedStrings/invalidFormat/UnrecognizedPrefix.txt (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/ArrayListTest.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/BootClassPathAppendHelper.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/C1.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/C2.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/Child.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/CpAttr1.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/CpAttr2.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/CpAttr3.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/CpAttr4.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/CpAttr5.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/DummyClassHelper.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/EmptyClassHelper.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/FieldAnnotationsApp.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/ForNameTest.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/GenericTestApp.java (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/GetFlightRecorder.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/Greet.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/Hello.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/HelloExt.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/HelloExtApp.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/HelloExtExt.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/HelloMore.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/HelloWB.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/Hi.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/Iloadw.jasm (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/IloadwMain.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/JimageClassPackage.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/JimageClassProtDomain.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/JvmtiApp.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/MethodNoReturn.jasm (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/MissingSuper.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/MultiProcClass.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/MyAnnotation.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/MyThread.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/PackageSealingTest.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/PackageTest.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/ParallelClasses.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/ParallelLoad.java (99%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/Prohibited.jasm (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/ProhibitedHelper.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/ProtDomain.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/ProtDomainB.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/ReportMyLoader.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/RewriteBytecodes.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/Super.java (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/TestClassLoader.java (96%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/TestWithProfilerHelper.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/TrySwitchMyLoader.java (95%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/Util.java (98%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/VerifierTest0.java (97%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/com/sun/tools/javac/Main.jasm (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/cpattr1.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/cpattr1_long.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/cpattr2.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/cpattr3.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/cpattr4.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/cpattr5_extra_long.mf (100%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/java/net/HttpCookie.jasm (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/javax/transaction/InvalidTransactionException.jasm (94%) rename test/hotspot/jtreg/runtime/{ => cds}/appcds/test-classes/package_seal.mf (100%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/javax/annotation/processing/FilerException.jasm (94%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/javax/sound/sampled/MyClass.jasm (94%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/nonjdk/myPackage/MyClass.java (93%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/ReplaceCriticalClasses.java (100%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/ReplaceCriticalClassesForSubgraphs.java (96%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/Implementor.java (94%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/Interface.java (93%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/SubClass.java (94%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/SuperClazz.java (94%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/TestEntry.java (95%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java (94%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/TransformRelatedClasses.java (99%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java (94%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java (94%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/TransformTestCommon.java (98%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java (94%) rename test/hotspot/jtreg/runtime/{SharedArchiveFile => cds}/serviceability/transformRelatedClasses/myPkg2/SubClass.java (96%) diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups index b13a5c45530..c5b2a7de1cc 100644 --- a/test/hotspot/jtreg/TEST.groups +++ b/test/hotspot/jtreg/TEST.groups @@ -296,8 +296,8 @@ tier1_runtime = \ -runtime/SelectionResolution/InvokeStaticICCE.java \ -runtime/SelectionResolution/InvokeVirtualICCE.java \ -runtime/SelectionResolution/InvokeVirtualSuccessTest.java \ - -runtime/SharedArchiveFile/CdsSameObjectAlignment.java \ - -runtime/SharedArchiveFile/SharedBaseAddress.java \ + -runtime/cds/CdsSameObjectAlignment.java \ + -runtime/cds/SharedBaseAddress.java \ -runtime/Thread/CancellableThreadTest.java \ -runtime/Thread/TestThreadDumpMonitorContention.java \ -runtime/Unsafe/RangeCheck.java \ @@ -307,40 +307,36 @@ tier1_runtime = \ -runtime/signal hotspot_cds = \ - runtime/SharedArchiveFile/ \ + runtime/cds/ \ runtime/CompressedOops/ -# AppCDS -# If modifying AppCDS it is also recommended to run the open hotspot_cds group -hotspot_appcds = \ - runtime/appcds/ hotspot_appcds_dynamic = \ - runtime/appcds/ \ - -runtime/appcds/cacheObject \ - -runtime/appcds/customLoader \ - -runtime/appcds/dynamicArchive \ - -runtime/appcds/javaldr/ArrayTest.java \ - -runtime/appcds/javaldr/GCSharedStringsDuringDump.java \ - -runtime/appcds/javaldr/HumongousDuringDump.java \ - -runtime/appcds/sharedStrings \ - -runtime/appcds/DumpClassList.java \ - -runtime/appcds/ExtraSymbols.java \ - -runtime/appcds/LongClassListPath.java \ - -runtime/appcds/LotsOfClasses.java \ - -runtime/appcds/RelativePath.java \ - -runtime/appcds/SharedArchiveConsistency.java \ - -runtime/appcds/UnusedCPDuringDump.java \ - -runtime/appcds/VerifierTest_1B.java + runtime/cds/appcds/ \ + -runtime/cds/appcds/cacheObject \ + -runtime/cds/appcds/customLoader \ + -runtime/cds/appcds/dynamicArchive \ + -runtime/cds/appcds/javaldr/ArrayTest.java \ + -runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java \ + -runtime/cds/appcds/javaldr/HumongousDuringDump.java \ + -runtime/cds/appcds/sharedStrings \ + -runtime/cds/appcds/DumpClassList.java \ + -runtime/cds/appcds/ExtraSymbols.java \ + -runtime/cds/appcds/LongClassListPath.java \ + -runtime/cds/appcds/LotsOfClasses.java \ + -runtime/cds/appcds/RelativePath.java \ + -runtime/cds/appcds/SharedArchiveConsistency.java \ + -runtime/cds/appcds/UnusedCPDuringDump.java \ + -runtime/cds/appcds/VerifierTest_1B.java # A subset of AppCDS tests to be run in tier1 tier1_runtime_appcds = \ - runtime/appcds/HelloTest.java \ - runtime/appcds/sharedStrings/SharedStringsBasic.java \ - runtime/appcds/ClassLoaderTest.java + runtime/cds/appcds/HelloTest.java \ + runtime/cds/appcds/sharedStrings/SharedStringsBasic.java \ + runtime/cds/appcds/ClassLoaderTest.java tier1_runtime_appcds_exclude = \ - runtime/appcds/ \ + runtime/cds/appcds/ \ -:tier1_runtime_appcds # This group should be executed with "jtreg -Dtest.cds.run.with.jfr=true ..." @@ -350,13 +346,13 @@ tier1_runtime_appcds_exclude = \ # The excluded tests disallow the jdk.jfr module, which is required to # run with JFR. hotspot_appcds_with_jfr = \ - runtime/appcds/ \ - -runtime/appcds/cacheObject/ArchivedModuleCompareTest.java \ - -runtime/appcds/jigsaw/classpathtests/BootAppendTests.java \ - -runtime/appcds/jigsaw/classpathtests/ClassPathTests.java \ - -runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java \ - -runtime/appcds/jigsaw/JigsawOptionsCombo.java \ - -runtime/appcds/jigsaw/modulepath/MainModuleOnly.java + runtime/cds/appcds/ \ + -runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java \ + -runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java \ + -runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java \ + -runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java \ + -runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java \ + -runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java tier1_serviceability = \ serviceability/dcmd/compiler \ diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/ArchiveDoesNotExist.java b/test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/ArchiveDoesNotExist.java rename to test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java index 24159a8cd5a..aa831f4a2f6 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/ArchiveDoesNotExist.java +++ b/test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java b/test/hotspot/jtreg/runtime/cds/BootAppendTests.java similarity index 99% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java rename to test/hotspot/jtreg/runtime/cds/BootAppendTests.java index 059ed508cd8..2adea3ab86a 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java +++ b/test/hotspot/jtreg/runtime/cds/BootAppendTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java b/test/hotspot/jtreg/runtime/cds/CdsDifferentCompactStrings.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java rename to test/hotspot/jtreg/runtime/cds/CdsDifferentCompactStrings.java index 56d60fd9122..d0115403c91 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java +++ b/test/hotspot/jtreg/runtime/cds/CdsDifferentCompactStrings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java b/test/hotspot/jtreg/runtime/cds/CdsDifferentObjectAlignment.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java rename to test/hotspot/jtreg/runtime/cds/CdsDifferentObjectAlignment.java index 6f21a477109..811073a6df0 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java +++ b/test/hotspot/jtreg/runtime/cds/CdsDifferentObjectAlignment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/CdsSameObjectAlignment.java b/test/hotspot/jtreg/runtime/cds/CdsSameObjectAlignment.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/CdsSameObjectAlignment.java rename to test/hotspot/jtreg/runtime/cds/CdsSameObjectAlignment.java index 1b37467d824..879f380eb63 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/CdsSameObjectAlignment.java +++ b/test/hotspot/jtreg/runtime/cds/CdsSameObjectAlignment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/CheckDefaultArchiveFile.java b/test/hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java similarity index 100% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/CheckDefaultArchiveFile.java rename to test/hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/CheckSharingWithDefaultArchive.java b/test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/CheckSharingWithDefaultArchive.java rename to test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java index d25331c11a4..3b28aa3add8 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/CheckSharingWithDefaultArchive.java +++ b/test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/DumpSharedDictionary.java b/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java similarity index 98% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/DumpSharedDictionary.java rename to test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java index 48b0db69cbc..ad593eae49e 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/DumpSharedDictionary.java +++ b/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java b/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java similarity index 98% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java rename to test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java index 68d63584701..ce898bdc1b8 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java +++ b/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/LoadClass.java b/test/hotspot/jtreg/runtime/cds/LoadClass.java similarity index 94% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/LoadClass.java rename to test/hotspot/jtreg/runtime/cds/LoadClass.java index 417f92451ae..7061061423b 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/LoadClass.java +++ b/test/hotspot/jtreg/runtime/cds/LoadClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java b/test/hotspot/jtreg/runtime/cds/MaxMetaspaceSize.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java rename to test/hotspot/jtreg/runtime/cds/MaxMetaspaceSize.java index 020c3219c64..56b89740f60 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java +++ b/test/hotspot/jtreg/runtime/cds/MaxMetaspaceSize.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/NonBootLoaderClasses.java b/test/hotspot/jtreg/runtime/cds/NonBootLoaderClasses.java similarity index 100% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/NonBootLoaderClasses.java rename to test/hotspot/jtreg/runtime/cds/NonBootLoaderClasses.java diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java b/test/hotspot/jtreg/runtime/cds/PrintSharedArchiveAndExit.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java rename to test/hotspot/jtreg/runtime/cds/PrintSharedArchiveAndExit.java index 756a0b0999a..e6d82dea507 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java +++ b/test/hotspot/jtreg/runtime/cds/PrintSharedArchiveAndExit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedArchiveFile.java b/test/hotspot/jtreg/runtime/cds/SharedArchiveFile.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/SharedArchiveFile.java rename to test/hotspot/jtreg/runtime/cds/SharedArchiveFile.java index 0ad543bfab7..0b1fde5943a 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedArchiveFile.java +++ b/test/hotspot/jtreg/runtime/cds/SharedArchiveFile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedBaseAddress.java b/test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/SharedBaseAddress.java rename to test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java index 82db13d55b4..9a98d638094 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedBaseAddress.java +++ b/test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStrings.java b/test/hotspot/jtreg/runtime/cds/SharedStrings.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStrings.java rename to test/hotspot/jtreg/runtime/cds/SharedStrings.java index 22ff4c771c7..3ae6eee0fc1 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStrings.java +++ b/test/hotspot/jtreg/runtime/cds/SharedStrings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsDedup.java b/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java similarity index 96% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsDedup.java rename to test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java index 717e62789a9..73e767f93c7 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsDedup.java +++ b/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsRunAuto.java b/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java similarity index 96% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsRunAuto.java rename to test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java index 352f056d98b..7f71734b00b 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsRunAuto.java +++ b/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsWb.java b/test/hotspot/jtreg/runtime/cds/SharedStringsWb.java similarity index 96% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsWb.java rename to test/hotspot/jtreg/runtime/cds/SharedStringsWb.java index 2cf8b0954c7..735731872e9 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStringsWb.java +++ b/test/hotspot/jtreg/runtime/cds/SharedStringsWb.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java b/test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java similarity index 97% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java rename to test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java index f80211c82e0..56db1f2e738 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java +++ b/test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/SpaceUtilizationCheck.java b/test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java similarity index 100% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/SpaceUtilizationCheck.java rename to test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java b/test/hotspot/jtreg/runtime/cds/TestInterpreterMethodEntries.java similarity index 100% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java rename to test/hotspot/jtreg/runtime/cds/TestInterpreterMethodEntries.java diff --git a/test/hotspot/jtreg/runtime/appcds/AppCDSOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/AppCDSOptions.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/AppCDSOptions.java rename to test/hotspot/jtreg/runtime/cds/appcds/AppCDSOptions.java index adaa3802b1e..a4fee6bdd69 100644 --- a/test/hotspot/jtreg/runtime/appcds/AppCDSOptions.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/AppCDSOptions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/AppendClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/AppendClasspath.java rename to test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java diff --git a/test/hotspot/jtreg/runtime/appcds/BootClassPathMismatch.java b/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/BootClassPathMismatch.java rename to test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java diff --git a/test/hotspot/jtreg/runtime/appcds/CDSandJFR.java b/test/hotspot/jtreg/runtime/cds/appcds/CDSandJFR.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/CDSandJFR.java rename to test/hotspot/jtreg/runtime/cds/appcds/CDSandJFR.java index 2f4651ecf34..f7d3e49feb5 100644 --- a/test/hotspot/jtreg/runtime/appcds/CDSandJFR.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/CDSandJFR.java @@ -26,7 +26,7 @@ * @test * @summary Make sure CDS and JFR work together. * @requires vm.hasJFR & vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes test-classes * @modules jdk.jfr * @build Hello GetFlightRecorder * @run driver ClassFileInstaller -jar CDSandJFR.jar Hello GetFlightRecorder GetFlightRecorder$TestEvent GetFlightRecorder$SimpleEvent diff --git a/test/hotspot/jtreg/runtime/appcds/CaseSensitiveClassPath.java b/test/hotspot/jtreg/runtime/cds/appcds/CaseSensitiveClassPath.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/CaseSensitiveClassPath.java rename to test/hotspot/jtreg/runtime/cds/appcds/CaseSensitiveClassPath.java diff --git a/test/hotspot/jtreg/runtime/appcds/ClassLoaderTest.java b/test/hotspot/jtreg/runtime/cds/appcds/ClassLoaderTest.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/ClassLoaderTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/ClassLoaderTest.java index 114d106de00..64b2815e6eb 100644 --- a/test/hotspot/jtreg/runtime/appcds/ClassLoaderTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassLoaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/ClassPathAttr.java b/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/ClassPathAttr.java rename to test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java index f5d224082eb..99636caf6b3 100644 --- a/test/hotspot/jtreg/runtime/appcds/ClassPathAttr.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java rename to test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java diff --git a/test/hotspot/jtreg/runtime/appcds/CommandLineFlagComboNegative.java b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/CommandLineFlagComboNegative.java rename to test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java diff --git a/test/hotspot/jtreg/runtime/appcds/CompilerUtils.java b/test/hotspot/jtreg/runtime/cds/appcds/CompilerUtils.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/CompilerUtils.java rename to test/hotspot/jtreg/runtime/cds/appcds/CompilerUtils.java index cfb5d20ba5c..21a19278177 100644 --- a/test/hotspot/jtreg/runtime/appcds/CompilerUtils.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/CompilerUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/DirClasspathTest.java b/test/hotspot/jtreg/runtime/cds/appcds/DirClasspathTest.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/DirClasspathTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/DirClasspathTest.java diff --git a/test/hotspot/jtreg/runtime/appcds/DumpClassList.java b/test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/DumpClassList.java rename to test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java index cb9cbe47934..0efa3ccefbe 100644 --- a/test/hotspot/jtreg/runtime/appcds/DumpClassList.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.invalid_1.txt b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.invalid_1.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/ExtraSymbols.invalid_1.txt rename to test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.invalid_1.txt diff --git a/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.invalid_2.txt b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.invalid_2.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/ExtraSymbols.invalid_2.txt rename to test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.invalid_2.txt diff --git a/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.invalid_3.txt b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.invalid_3.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/ExtraSymbols.invalid_3.txt rename to test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.invalid_3.txt diff --git a/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.java b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/ExtraSymbols.java rename to test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java index 0acf5f2bb41..82b61aec66b 100644 --- a/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/ExtraSymbols.symbols.txt b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.symbols.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/ExtraSymbols.symbols.txt rename to test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.symbols.txt diff --git a/test/hotspot/jtreg/runtime/appcds/FieldAnnotationsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/FieldAnnotationsTest.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/FieldAnnotationsTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/FieldAnnotationsTest.java index 186dde34e32..3322bf98d55 100644 --- a/test/hotspot/jtreg/runtime/appcds/FieldAnnotationsTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/FieldAnnotationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/FreeUnusedMetadata.java b/test/hotspot/jtreg/runtime/cds/appcds/FreeUnusedMetadata.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/FreeUnusedMetadata.java rename to test/hotspot/jtreg/runtime/cds/appcds/FreeUnusedMetadata.java index 282fb9d47e4..5a50fa25559 100644 --- a/test/hotspot/jtreg/runtime/appcds/FreeUnusedMetadata.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/FreeUnusedMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/GraalWithLimitedMetaspace.java b/test/hotspot/jtreg/runtime/cds/appcds/GraalWithLimitedMetaspace.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/GraalWithLimitedMetaspace.java rename to test/hotspot/jtreg/runtime/cds/appcds/GraalWithLimitedMetaspace.java diff --git a/test/hotspot/jtreg/runtime/appcds/HelloExtTest.java b/test/hotspot/jtreg/runtime/cds/appcds/HelloExtTest.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/HelloExtTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/HelloExtTest.java index 608548661cf..89e24d89ffe 100644 --- a/test/hotspot/jtreg/runtime/appcds/HelloExtTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/HelloExtTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/HelloTest.java b/test/hotspot/jtreg/runtime/cds/appcds/HelloTest.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/HelloTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/HelloTest.java index 3d1ff499678..d666f07ed3b 100644 --- a/test/hotspot/jtreg/runtime/appcds/HelloTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/HelloTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/IgnoreEmptyClassPaths.java b/test/hotspot/jtreg/runtime/cds/appcds/IgnoreEmptyClassPaths.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/IgnoreEmptyClassPaths.java rename to test/hotspot/jtreg/runtime/cds/appcds/IgnoreEmptyClassPaths.java index 8eb82b50142..c93ba38c357 100644 --- a/test/hotspot/jtreg/runtime/appcds/IgnoreEmptyClassPaths.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/IgnoreEmptyClassPaths.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/JarBuilder.java b/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/JarBuilder.java rename to test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java index d96b6efb8be..940c710cb8b 100644 --- a/test/hotspot/jtreg/runtime/appcds/JarBuilder.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/JvmtiAddPath.java b/test/hotspot/jtreg/runtime/cds/appcds/JvmtiAddPath.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/JvmtiAddPath.java rename to test/hotspot/jtreg/runtime/cds/appcds/JvmtiAddPath.java diff --git a/test/hotspot/jtreg/runtime/appcds/LongClassListPath.java b/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/LongClassListPath.java rename to test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java diff --git a/test/hotspot/jtreg/runtime/appcds/LotsOfClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfClasses.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/LotsOfClasses.java rename to test/hotspot/jtreg/runtime/cds/appcds/LotsOfClasses.java index 488254acfc0..8069c2b492f 100644 --- a/test/hotspot/jtreg/runtime/appcds/LotsOfClasses.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfClasses.java @@ -33,7 +33,7 @@ import jdk.test.lib.process.OutputAnalyzer; * @summary Try to archive lots of classes by searching for classes from the jrt:/ file system. With JDK 12 * this will produce an archive with over 30,000 classes. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @run driver/timeout=500 LotsOfClasses */ diff --git a/test/hotspot/jtreg/runtime/appcds/MissingSuperTest.java b/test/hotspot/jtreg/runtime/cds/appcds/MissingSuperTest.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/MissingSuperTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/MissingSuperTest.java index d39a39cd26d..4c5ccdbd00b 100644 --- a/test/hotspot/jtreg/runtime/appcds/MissingSuperTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/MissingSuperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java b/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java index 58befbde714..04a168c5f98 100644 --- a/test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/MultiProcessSharing.java b/test/hotspot/jtreg/runtime/cds/appcds/MultiProcessSharing.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/MultiProcessSharing.java rename to test/hotspot/jtreg/runtime/cds/appcds/MultiProcessSharing.java index ab7d61fab2b..2fb40bfd227 100644 --- a/test/hotspot/jtreg/runtime/appcds/MultiProcessSharing.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/MultiProcessSharing.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/MultiReleaseJars.java b/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/MultiReleaseJars.java rename to test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java index 6cf1b30ae66..f44c2334bc7 100644 --- a/test/hotspot/jtreg/runtime/appcds/MultiReleaseJars.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/OldClassTest.java b/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/OldClassTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java index 22c492c06ec..f57ca1d9475 100644 --- a/test/hotspot/jtreg/runtime/appcds/OldClassTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/PackageSealing.java b/test/hotspot/jtreg/runtime/cds/appcds/PackageSealing.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/PackageSealing.java rename to test/hotspot/jtreg/runtime/cds/appcds/PackageSealing.java diff --git a/test/hotspot/jtreg/runtime/appcds/ParallelLoad2.java b/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoad2.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/ParallelLoad2.java rename to test/hotspot/jtreg/runtime/cds/appcds/ParallelLoad2.java index 6a72f62c053..88b13e49e15 100644 --- a/test/hotspot/jtreg/runtime/appcds/ParallelLoad2.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoad2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/ParallelLoadTest.java b/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoadTest.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/ParallelLoadTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/ParallelLoadTest.java index 69765fd3137..14ad9162723 100644 --- a/test/hotspot/jtreg/runtime/appcds/ParallelLoadTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoadTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/PrintSharedArchiveAndExit.java b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/PrintSharedArchiveAndExit.java rename to test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java index c01e2a11042..20bf35f95bd 100644 --- a/test/hotspot/jtreg/runtime/appcds/PrintSharedArchiveAndExit.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/ProhibitedPackage.java b/test/hotspot/jtreg/runtime/cds/appcds/ProhibitedPackage.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/ProhibitedPackage.java rename to test/hotspot/jtreg/runtime/cds/appcds/ProhibitedPackage.java diff --git a/test/hotspot/jtreg/runtime/appcds/ProtectionDomain.java b/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/ProtectionDomain.java rename to test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java diff --git a/test/hotspot/jtreg/runtime/appcds/RelativePath.java b/test/hotspot/jtreg/runtime/cds/appcds/RelativePath.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/RelativePath.java rename to test/hotspot/jtreg/runtime/cds/appcds/RelativePath.java diff --git a/test/hotspot/jtreg/runtime/appcds/RewriteBytecodesTest.java b/test/hotspot/jtreg/runtime/cds/appcds/RewriteBytecodesTest.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/RewriteBytecodesTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/RewriteBytecodesTest.java index 28a2dae8c68..40bc84d883c 100644 --- a/test/hotspot/jtreg/runtime/appcds/RewriteBytecodesTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/RewriteBytecodesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java b/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java rename to test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java diff --git a/test/hotspot/jtreg/runtime/appcds/SharedBaseAddress.java b/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/SharedBaseAddress.java rename to test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java index 172beee2acf..c12b941a41c 100644 --- a/test/hotspot/jtreg/runtime/appcds/SharedBaseAddress.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/SharedPackages.java b/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/SharedPackages.java rename to test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java index 7681b0401f9..d0b99e8b9f7 100644 --- a/test/hotspot/jtreg/runtime/appcds/SharedPackages.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/SignedJar.java b/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/SignedJar.java rename to test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java index 9a7a2fdfa8b..b577375699e 100644 --- a/test/hotspot/jtreg/runtime/appcds/SignedJar.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/SpecifySysLoaderProp.java b/test/hotspot/jtreg/runtime/cds/appcds/SpecifySysLoaderProp.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/SpecifySysLoaderProp.java rename to test/hotspot/jtreg/runtime/cds/appcds/SpecifySysLoaderProp.java index 570f48d1389..0aa287e3f45 100644 --- a/test/hotspot/jtreg/runtime/appcds/SpecifySysLoaderProp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/SpecifySysLoaderProp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/TestCommon.java b/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/TestCommon.java rename to test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java diff --git a/test/hotspot/jtreg/runtime/appcds/TestWithProfiler.java b/test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/TestWithProfiler.java rename to test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java index f94c1d3b23f..7b243672340 100644 --- a/test/hotspot/jtreg/runtime/appcds/TestWithProfiler.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * This is to test the safe handling of trampoline functions by the * profiler. * @requires vm.hasJFR & vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/TraceLongClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/TraceLongClasspath.java rename to test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java diff --git a/test/hotspot/jtreg/runtime/appcds/UnusedCPDuringDump.java b/test/hotspot/jtreg/runtime/cds/appcds/UnusedCPDuringDump.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/UnusedCPDuringDump.java rename to test/hotspot/jtreg/runtime/cds/appcds/UnusedCPDuringDump.java index 32aae3826e1..c7a58895981 100644 --- a/test/hotspot/jtreg/runtime/appcds/UnusedCPDuringDump.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/UnusedCPDuringDump.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/UseAppCDS_Test.java b/test/hotspot/jtreg/runtime/cds/appcds/UseAppCDS_Test.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/UseAppCDS_Test.java rename to test/hotspot/jtreg/runtime/cds/appcds/UseAppCDS_Test.java index 438c614445b..8a35ff52450 100644 --- a/test/hotspot/jtreg/runtime/appcds/UseAppCDS_Test.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/UseAppCDS_Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/VerifierTest.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/VerifierTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java diff --git a/test/hotspot/jtreg/runtime/appcds/VerifierTest_0.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/VerifierTest_0.java rename to test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java index 4bf4e6e83b4..a6f51395839 100644 --- a/test/hotspot/jtreg/runtime/appcds/VerifierTest_0.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/VerifierTest_1A.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/VerifierTest_1A.java rename to test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java index 438d7aaf4aa..67bde39eb54 100644 --- a/test/hotspot/jtreg/runtime/appcds/VerifierTest_1A.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/VerifierTest_1B.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/VerifierTest_1B.java rename to test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java index 460e3535294..a43beab4bd6 100644 --- a/test/hotspot/jtreg/runtime/appcds/VerifierTest_1B.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/VerifierTest_2.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/VerifierTest_2.java rename to test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java index 2242347952c..f2299d9b655 100644 --- a/test/hotspot/jtreg/runtime/appcds/VerifierTest_2.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/WideIloadTest.java b/test/hotspot/jtreg/runtime/cds/appcds/WideIloadTest.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/WideIloadTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/WideIloadTest.java index 70c8ab81456..fa783161d4e 100644 --- a/test/hotspot/jtreg/runtime/appcds/WideIloadTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/WideIloadTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/WrongClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/WrongClasspath.java rename to test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java diff --git a/test/hotspot/jtreg/runtime/appcds/XShareAutoWithChangedJar.java b/test/hotspot/jtreg/runtime/cds/appcds/XShareAutoWithChangedJar.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/XShareAutoWithChangedJar.java rename to test/hotspot/jtreg/runtime/cds/appcds/XShareAutoWithChangedJar.java index ec91437d84a..d603c3d0c4b 100644 --- a/test/hotspot/jtreg/runtime/appcds/XShareAutoWithChangedJar.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/XShareAutoWithChangedJar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedIntegerCacheTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedIntegerCacheTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java index 9126fea86b4..b65d62edc0a 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedIntegerCacheTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Test primitive box caches integrity in various scenarios (IntegerCache etc) * @requires vm.cds.archived.java.heap - * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleComboTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleComboTest.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleComboTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleComboTest.java index 0c151067f3e..f79354e82cd 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleComboTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleComboTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Test archived system module sub-graph and verify objects are archived. * @requires vm.cds.archived.java.heap - * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleCompareTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleCompareTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java index 9bf7278dd46..9ae507c7091 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleCompareTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Compare archived system modules with non-archived. * @requires vm.cds.archived.java.heap - * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java index 5deb0b8f624..6e15b83e208 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test * @summary Test archived module graph with custom runtime image * @requires vm.cds.archived.java.heap - * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.module * java.management * jdk.jlink diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckArchivedModuleApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckArchivedModuleApp.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/CheckArchivedModuleApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckArchivedModuleApp.java index d7774187c3f..63b656666f5 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckArchivedModuleApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckArchivedModuleApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedMirrorApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorApp.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedMirrorApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorApp.java index 337191c349f..7dbc5d0aa67 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedMirrorApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedMirrorTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedMirrorTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java index 9db92b0c175..5ab95707d4c 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedMirrorTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary Test archived mirror * @requires vm.cds.archived.java.heap * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * @modules java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedResolvedReferences.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedResolvedReferences.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java index bb798c48232..8cab2719e95 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedResolvedReferences.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary Test resolved_references * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * @modules java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedResolvedReferencesApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferencesApp.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedResolvedReferencesApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferencesApp.java index 0db69dd3391..bc6e392561f 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckCachedResolvedReferencesApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferencesApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckIntegerCacheApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckIntegerCacheApp.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/CheckIntegerCacheApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckIntegerCacheApp.java index de175a26c6d..c861465b5ad 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/CheckIntegerCacheApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckIntegerCacheApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/DifferentHeapSizes.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DifferentHeapSizes.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/DifferentHeapSizes.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DifferentHeapSizes.java index 6a034202b82..7ca9171553e 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/DifferentHeapSizes.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DifferentHeapSizes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @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/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java * @build sun.hotspot.WhiteBox diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/DumpTimeVerifyFailure.config.txt b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.config.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/DumpTimeVerifyFailure.config.txt rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.config.txt diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/DumpTimeVerifyFailure.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/DumpTimeVerifyFailure.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.java index cd2f63f41a7..ae6a607be29 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/DumpTimeVerifyFailure.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary Dump time should not crash if any class with shared strings fails verification due to missing dependencies. * @bug 8186789 * @requires vm.cds.archived.java.heap - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * @modules java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/GCStress.config.txt b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStress.config.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/GCStress.config.txt rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStress.config.txt diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/GCStressApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressApp.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/GCStressApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressApp.java index 636da040d6b..0117c7f4f61 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/GCStressApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/GCStressTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressTest.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/GCStressTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressTest.java index 1f3bfcbae37..049151f2220 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/GCStressTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary * @requires vm.cds.archived.java.heap - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * @modules java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/InstrumentationAgent.mf b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/InstrumentationAgent.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/InstrumentationAgent.mf rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/InstrumentationAgent.mf diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/MirrorWithReferenceFieldsApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsApp.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/MirrorWithReferenceFieldsApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsApp.java index 9027c06f8af..93807bbf8bd 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/MirrorWithReferenceFieldsApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/MirrorWithReferenceFieldsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsTest.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/MirrorWithReferenceFieldsTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsTest.java index 68dbc4da469..51de533e380 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/MirrorWithReferenceFieldsTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Test archived mirror with reference fields * @requires vm.cds.archived.java.heap - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * @modules java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/MyException.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MyException.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/MyException.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MyException.java index 39a464b4f00..acdc2bad714 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/MyException.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MyException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/MyOuter.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MyOuter.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/MyOuter.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MyOuter.java index 8773772ac68..f992257d5c0 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/MyOuter.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MyOuter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/OpenArchiveRegion.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/OpenArchiveRegion.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/OpenArchiveRegion.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/OpenArchiveRegion.java index eb3020286a8..8b09599aff8 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/OpenArchiveRegion.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/OpenArchiveRegion.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * via the -vmoptions command line option of JTREG. vm.gc==null will help the test case to discard the explicitly passed * vm options. * @requires (vm.gc=="null") - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * @modules java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/PrimitiveTypesApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrimitiveTypesApp.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/PrimitiveTypesApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrimitiveTypesApp.java index bc1ddf47ba5..81e63c10d05 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/PrimitiveTypesApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrimitiveTypesApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/PrimitiveTypesTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrimitiveTypesTest.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/PrimitiveTypesTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrimitiveTypesTest.java index 4a5bacfba7a..0f73af84cb7 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/PrimitiveTypesTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrimitiveTypesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Test archived primitive type mirrors * @requires vm.cds.archived.java.heap - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * @modules java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/PrintSystemModulesApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrintSystemModulesApp.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/PrintSystemModulesApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrintSystemModulesApp.java index 44d4cebf819..2878ed335af 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/PrintSystemModulesApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrintSystemModulesApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/RedefineClassApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassApp.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/RedefineClassApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassApp.java index 35004b54568..2441cf47085 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/RedefineClassApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/RedefineClassTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassTest.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/RedefineClassTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassTest.java index 9a29cb993d5..c808f673617 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/RedefineClassTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ /* * @test * @summary Redefine shared class. GC should not cause crash with cached resolved_references. - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes /test/hotspot/jtreg/runtime/appcds/jvmti + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes /test/hotspot/jtreg/runtime/cds/appcds/jvmti * @requires vm.cds.archived.java.heap * @modules java.base/jdk.internal.misc * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/src/test/jdk/test/Test.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/src/test/jdk/test/Test.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/src/test/jdk/test/Test.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/src/test/jdk/test/Test.java index 9d1ab13daaf..80bb5b03c18 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/src/test/jdk/test/Test.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/src/test/jdk/test/Test.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/src/test/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/src/test/module-info.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/cacheObject/src/test/module-info.java rename to test/hotspot/jtreg/runtime/cds/appcds/cacheObject/src/test/module-info.java index 1972e2c7379..a990090ebac 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/src/test/module-info.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/src/test/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/cdsutils/DynamicDumpHelper.java b/test/hotspot/jtreg/runtime/cds/appcds/cdsutils/DynamicDumpHelper.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/cdsutils/DynamicDumpHelper.java rename to test/hotspot/jtreg/runtime/cds/appcds/cdsutils/DynamicDumpHelper.java diff --git a/test/hotspot/jtreg/runtime/appcds/condy/CondyHello.jasm b/test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHello.jasm similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/condy/CondyHello.jasm rename to test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHello.jasm index d409f29dba2..ed42f13de3e 100644 --- a/test/hotspot/jtreg/runtime/appcds/condy/CondyHello.jasm +++ b/test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHello.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/condy/CondyHelloApp.java b/test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHelloApp.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/condy/CondyHelloApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHelloApp.java index 89467301422..6315ca08f94 100644 --- a/test/hotspot/jtreg/runtime/appcds/condy/CondyHelloApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHelloApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/condy/CondyHelloTest.java b/test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHelloTest.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/condy/CondyHelloTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHelloTest.java index d2bf46549a8..eb99074aac1 100644 --- a/test/hotspot/jtreg/runtime/appcds/condy/CondyHelloTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHelloTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @summary Make sure CDS works with a minimal test case that uses a CONSTANT_Dynamic constant-pool entry * @requires (vm.cds) * @modules java.base/jdk.internal.misc - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @build CondyHello * @build sun.hotspot.WhiteBox CondyHelloTest CondyHelloApp * @run driver ClassFileInstaller -jar condy_hello.jar CondyHello CondyHelloApp diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatA.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatA.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java index b1ccb22101e..9346260ea39 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatA.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java @@ -28,7 +28,7 @@ * * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatB.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatB.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatB.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatB.java index 02d8dac49cc..e9bf218ddc3 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatB.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatB.java @@ -28,7 +28,7 @@ * * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatBase.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatBase.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatBase.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatBase.java index e6cae476905..81ee1c7631f 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatBase.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatC.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatC.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatC.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatC.java index ae672a81609..c4dc974c057 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatC.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatC.java @@ -28,7 +28,7 @@ * * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatD.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatD.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java index 5b5db47e599..4e04470ee3c 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatD.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java @@ -28,7 +28,7 @@ * * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatE.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatE.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java index 8043540c267..eb414dcb815 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatE.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java @@ -28,7 +28,7 @@ * * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/CustomLoaderApp.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/CustomLoaderApp.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/customLoader/CustomLoaderApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/CustomLoaderApp.java index 0075529e8f5..9db26328140 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/CustomLoaderApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/CustomLoaderApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java index ffbfe945c44..d902bc9db5d 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java @@ -27,7 +27,7 @@ * @summary Hello World test for AppCDS custom loader support * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /runtime/testlibrary + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /runtime/testlibrary * @modules java.base/jdk.internal.misc * java.management * @compile test-classes/HelloUnload.java test-classes/CustomLoadee.java diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom_JFR.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom_JFR.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom_JFR.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom_JFR.java index 4952db12b0a..9f052386e11 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom_JFR.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom_JFR.java @@ -30,7 +30,7 @@ * @requires vm.hasJFR * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /runtime/testlibrary + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /runtime/testlibrary * @compile test-classes/HelloUnload.java test-classes/CustomLoadee.java * @build sun.hotspot.WhiteBox ClassUnloadCommon * @run driver ClassFileInstaller -jar hello.jar HelloUnload ClassUnloadCommon ClassUnloadCommon$1 ClassUnloadCommon$TestFailure diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/LoaderSegregationTest.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/customLoader/LoaderSegregationTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java index 89c9ad9ed78..77cf1ec8846 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/LoaderSegregationTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ * custom loader classes. * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ParallelTestBase.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestBase.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ParallelTestBase.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestBase.java index a536d831a27..04ad39c8c99 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ParallelTestBase.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ParallelTestMultiFP.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestMultiFP.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ParallelTestMultiFP.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestMultiFP.java index 9c9526bb2c5..5c52af2067c 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ParallelTestMultiFP.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestMultiFP.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary Load classes from CDS archive into multiple custom loader using parallel threads * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ParallelTestSingleFP.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestSingleFP.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ParallelTestSingleFP.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestSingleFP.java index 04b44702b46..27415157987 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ParallelTestSingleFP.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestSingleFP.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary Load classes from CDS archive into a single custom loader using parallel threads (finger print) * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ProhibitedPackageNamesTest.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProhibitedPackageNamesTest.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ProhibitedPackageNamesTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProhibitedPackageNamesTest.java index fc0ba8b7601..56c73fb5667 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ProhibitedPackageNamesTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProhibitedPackageNamesTest.java @@ -27,7 +27,7 @@ * @summary Make sure prohibited packages cannot be stored into archive for custom loaders. * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/ProtectionDomain.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProtectionDomain.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/ProtectionDomain.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProtectionDomain.java index 75b1635def4..c3ee944d184 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/ProtectionDomain.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProtectionDomain.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/SameNameInTwoLoadersTest.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/customLoader/SameNameInTwoLoadersTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java index 72b692ca441..420483df8ee 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/SameNameInTwoLoadersTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/UnintendedLoadersTest.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnintendedLoadersTest.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/customLoader/UnintendedLoadersTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnintendedLoadersTest.java index 41a2e5fe82c..725c94a3044 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/UnintendedLoadersTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnintendedLoadersTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary Make sure classes intended for custom loaders cannot be loaded by BOOT/EXT/APP loaders * @requires vm.cds * @requires vm.cds.custom.loaders - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java index b21596d9d49..3a5c362111f 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ * @requires vm.cds * @requires vm.cds.custom.loaders * @requires vm.opt.final.ClassUnloading - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/testlibrary + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/testlibrary * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/UnsupportedPlatforms.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnsupportedPlatforms.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/UnsupportedPlatforms.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnsupportedPlatforms.java index 56019d0ddde..2b524cf589b 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/UnsupportedPlatforms.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnsupportedPlatforms.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @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/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomInterface2_ia.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomInterface2_ia.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomInterface2_ia.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomInterface2_ia.java index 99da97c4c83..047e89f996c 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomInterface2_ia.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomInterface2_ia.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomInterface2_ib.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomInterface2_ib.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomInterface2_ib.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomInterface2_ib.java index 5d4990725b4..43e25d766eb 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomInterface2_ib.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomInterface2_ib.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee.java index 7848c282873..5cc1e412c8d 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee2.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee2.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee2.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee2.java index 779f1919d28..8224b07399c 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee2.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee3.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee3.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee3.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee3.java index 7af68cf6100..71e8fe2a8c4 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee3.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee3.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee3Child.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee3Child.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee3Child.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee3Child.java index fa47bf962cf..76ec4ef83db 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/CustomLoadee3Child.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee3Child.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/Hello.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/Hello.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/Hello.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/Hello.java index 2c9c796bca1..ab56cfdf003 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/Hello.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/Hello.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/HelloUnload.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/HelloUnload.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/HelloUnload.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/HelloUnload.java diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/InProhibitedPkg.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/InProhibitedPkg.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/InProhibitedPkg.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/InProhibitedPkg.java index 0bd6ad64385..3280210063c 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/InProhibitedPkg.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/InProhibitedPkg.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/LoaderAPI.mf b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/LoaderAPI.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/LoaderAPI.mf rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/LoaderAPI.mf diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/LoaderSegregation.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/LoaderSegregation.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/LoaderSegregation.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/LoaderSegregation.java index 4cd4ab7d640..9f984e546f2 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/LoaderSegregation.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/LoaderSegregation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/OnlyBuiltin.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/OnlyBuiltin.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/OnlyBuiltin.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/OnlyBuiltin.java index 90390f52e8b..0978613e3b6 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/OnlyBuiltin.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/OnlyBuiltin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/OnlyUnregistered.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/OnlyUnregistered.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/OnlyUnregistered.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/OnlyUnregistered.java index 9a24f2925ad..d39106d2724 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/OnlyUnregistered.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/OnlyUnregistered.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/ProtDomain.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/ProtDomain.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/ProtDomain.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/ProtDomain.java index bdc37ca78f3..a45a8352ece 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/ProtDomain.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/ProtDomain.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/SameNameUnrelatedLoaders.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/SameNameUnrelatedLoaders.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/SameNameUnrelatedLoaders.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/SameNameUnrelatedLoaders.java index 10b436563ec..cf8a8ddab94 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/SameNameUnrelatedLoaders.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/SameNameUnrelatedLoaders.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/SimpleHello.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/SimpleHello.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/SimpleHello.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/SimpleHello.java index 3da0d6c8cb5..19a1e16c896 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/SimpleHello.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/SimpleHello.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/UnintendedLoaders.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/UnintendedLoaders.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/UnintendedLoaders.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/UnintendedLoaders.java index c380876d3ad..e7f33e8fd64 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/UnintendedLoaders.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/UnintendedLoaders.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/UnloadUnregisteredLoader.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/UnloadUnregisteredLoader.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/UnloadUnregisteredLoader.java rename to test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/UnloadUnregisteredLoader.java index 47bf6d1b2e1..02bdd31098b 100644 --- a/test/hotspot/jtreg/runtime/appcds/customLoader/test-classes/UnloadUnregisteredLoader.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/UnloadUnregisteredLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/AppendClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/AppendClasspath.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/AppendClasspath.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/AppendClasspath.java index c16c1db1539..a02ca2cf6c1 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/AppendClasspath.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/AppendClasspath.java @@ -26,7 +26,7 @@ * @test * @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/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/ArchiveConsistency.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/ArchiveConsistency.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java index 70ef01d09c9..1a166675a77 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/ArchiveConsistency.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java @@ -26,7 +26,7 @@ * @test * @summary Corrupt the header CRC fields of the top archive. VM should exit with an error. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @build Hello sun.hotspot.WhiteBox * @run driver ClassFileInstaller -jar hello.jar Hello * @run driver ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/ArrayKlasses.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArrayKlasses.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/ArrayKlasses.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArrayKlasses.java index d32c22cfcdf..083f82e174c 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/ArrayKlasses.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArrayKlasses.java @@ -26,8 +26,8 @@ * @test * @summary handling of the existence of InstanceKlass::array_klasses() * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds - * /test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds + * /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes * @build ArrayKlassesApp * @run driver ClassFileInstaller -jar ArrayKlasses.jar * ArrayKlassesApp diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/ClassResolutionFailure.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ClassResolutionFailure.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/ClassResolutionFailure.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ClassResolutionFailure.java index 224b3cfc4d0..e89a7454da7 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/ClassResolutionFailure.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ClassResolutionFailure.java @@ -28,7 +28,7 @@ * The main class should be archived. During run time, the main class * should be loaded from the archive. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes * @build StrConcatApp * @build MissingDependent * @run driver ClassFileInstaller -jar missingDependent.jar MissingDependent diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/DynamicArchiveTestBase.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveTestBase.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/DynamicArchiveTestBase.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveTestBase.java index 22586dbbf5e..228f59dd7ba 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/DynamicArchiveTestBase.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveTestBase.java @@ -30,7 +30,7 @@ import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.cds.CDSTestUtils.Result; /** - * Base class for test cases in test/hotspot/jtreg/runtime/appcds/dynamicArchive/ + * Base class for test cases in test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ */ class DynamicArchiveTestBase { private static boolean executedIn_run = false; diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/DynamicFlag.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicFlag.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/DynamicFlag.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicFlag.java index f82dc391c4d..62642303d98 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/DynamicFlag.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicFlag.java @@ -26,7 +26,7 @@ * @test * @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/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/DynamicLotsOfClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/DynamicLotsOfClasses.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.java index aef87f159ca..9ceb3120673 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/DynamicLotsOfClasses.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.java @@ -35,7 +35,7 @@ import java.util.ArrayList; * @summary Try to archive lots of classes by searching for classes from the jrt:/ file system. With JDK 12 * this will produce an archive with over 30,000 classes. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes * @build LoadClasses * @build sun.hotspot.WhiteBox * @modules jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/ExcludedClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ExcludedClasses.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/ExcludedClasses.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ExcludedClasses.java index 2f7f8c53710..bc6561e99f0 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/ExcludedClasses.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ExcludedClasses.java @@ -26,8 +26,8 @@ * @test * @summary Unreferenced app classes during dump time should not be included in the archive. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds - * /test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds + * /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes * @build ExcludedClassesApp * @run driver ClassFileInstaller -jar ExcludedClasses.jar * ExcludedClassesApp diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/HelloDynamic.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamic.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/HelloDynamic.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamic.java index 47e881e480d..7c38542941f 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/HelloDynamic.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamic.java @@ -26,7 +26,7 @@ * @test * @summary Hello World test for dynamic archive * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @build Hello * @run driver ClassFileInstaller -jar hello.jar Hello * @run driver HelloDynamic diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/HelloDynamicCustom.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustom.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/HelloDynamicCustom.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustom.java index 646cd076d4e..9f12f80130c 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/HelloDynamicCustom.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustom.java @@ -26,7 +26,7 @@ * @test * @summary Hello World test for dynamic archive with custom loader * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/customLoader/test-classes /runtime/testlibrary + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes /runtime/testlibrary * @build HelloUnload CustomLoadee ClassUnloadCommon * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller -jar hello.jar HelloUnload ClassUnloadCommon ClassUnloadCommon$1 ClassUnloadCommon$TestFailure diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/HelloDynamicCustomUnload.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustomUnload.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/HelloDynamicCustomUnload.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustomUnload.java index 4d3480f9abb..bba552e13f4 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/HelloDynamicCustomUnload.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustomUnload.java @@ -29,7 +29,7 @@ * dump time and run time. The custom loader will be unloaded * during dump time. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/customLoader/test-classes /runtime/testlibrary + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes /runtime/testlibrary * @build HelloUnload CustomLoadee ClassUnloadCommon * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller -jar hello.jar HelloUnload ClassUnloadCommon ClassUnloadCommon$1 ClassUnloadCommon$TestFailure diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/JITInteraction.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/JITInteraction.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/JITInteraction.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/JITInteraction.java index 6f9f480e439..f873fb827ea 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/JITInteraction.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/JITInteraction.java @@ -26,7 +26,7 @@ * @test * @summary Test interaction with JIT threads during vm exit. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes * @build TestJIT * @modules jdk.jartool/sun.tools.jar * @build sun.hotspot.WhiteBox diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/MainModuleOnly.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/MainModuleOnly.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java index 3cc4c3a103f..7e26fb0e6f7 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/MainModuleOnly.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java @@ -25,7 +25,7 @@ /** * @test * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.compiler * jdk.jartool/sun.tools.jar * jdk.jlink diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/MethodSorting.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MethodSorting.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/MethodSorting.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MethodSorting.java index d534ca8b366..3ec6d5cec68 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/MethodSorting.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MethodSorting.java @@ -29,8 +29,8 @@ * that the dumped InstanceKlass to re-sort their "methods" array and re-layout the vtables/itables. * A regression test for an earlier bug in DynamicArchiveBuilder::relocate_buffer_to_target(). * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes - * /test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes + * /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes * @build MethodSortingApp * @run driver ClassFileInstaller -jar method_sorting.jar * MethodSortingApp diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/MissingArchive.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MissingArchive.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/MissingArchive.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MissingArchive.java index 8a814816aab..460a8bfeef3 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/MissingArchive.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MissingArchive.java @@ -28,7 +28,7 @@ import java.io.File; * @test * @summary error handling when either (or both) of the base/top archives are missing. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @build GenericTestApp sun.hotspot.WhiteBox * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox * @run driver ClassFileInstaller -jar GenericTestApp.jar GenericTestApp diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/NoClassToArchive.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NoClassToArchive.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/NoClassToArchive.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NoClassToArchive.java index 35f69b25052..10671e14ddb 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/NoClassToArchive.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NoClassToArchive.java @@ -26,7 +26,7 @@ * @test * @summary A few edge cases where there's no class to be included in the dynamic archive. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes * @build StrConcatApp * @run driver ClassFileInstaller -jar strConcatApp.jar StrConcatApp * @run driver NoClassToArchive diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/RelativePath.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RelativePath.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/RelativePath.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RelativePath.java index 1b8844e7218..6bb3be0927e 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/RelativePath.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RelativePath.java @@ -26,7 +26,7 @@ * @test * @summary Test relative paths specified in the -cp. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/SharedArchiveFileOption.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/SharedArchiveFileOption.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/SharedArchiveFileOption.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/SharedArchiveFileOption.java index 6c21a73f570..91da6708cb4 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/SharedArchiveFileOption.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/SharedArchiveFileOption.java @@ -26,7 +26,7 @@ * @test * @summary Some negative tests for the SharedArchiveFile option * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @build Hello * @run driver ClassFileInstaller -jar hello.jar Hello * @run driver SharedArchiveFileOption diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/UnsupportedBaseArchive.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnsupportedBaseArchive.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/UnsupportedBaseArchive.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnsupportedBaseArchive.java index ef0a43e9198..3eda6e3bfc6 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/UnsupportedBaseArchive.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnsupportedBaseArchive.java @@ -31,7 +31,7 @@ import java.nio.file.Paths; * @test * @summary unsupported base archive tests * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @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 diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/UnusedCPDuringDump.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnusedCPDuringDump.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/UnusedCPDuringDump.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnusedCPDuringDump.java index 5f08b87242f..a304c632af9 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/UnusedCPDuringDump.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UnusedCPDuringDump.java @@ -28,7 +28,7 @@ * from the system modules are being loaded even though some are * defined to the PlatformClassLoader and AppClassLoader. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @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 diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/WrongTopClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/WrongTopClasspath.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java index d1eb3c0570f..4006a0fe6cd 100644 --- a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/WrongTopClasspath.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java @@ -28,7 +28,7 @@ import java.io.File; * @test * @summary correct classpath for bottom archive, but bad classpath for top archive * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @build GenericTestApp sun.hotspot.WhiteBox * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox * @run driver ClassFileInstaller -jar GenericTestApp.jar GenericTestApp diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/ArrayKlassesApp.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/ArrayKlassesApp.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/ArrayKlassesApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/ArrayKlassesApp.java diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/ExcludedClassesApp.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/ExcludedClassesApp.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/ExcludedClassesApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/ExcludedClassesApp.java diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/LoadClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/LoadClasses.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/LoadClasses.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/LoadClasses.java diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/MethodSortingApp.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/MethodSortingApp.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/MethodSortingApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/MethodSortingApp.java diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/MissingDependent.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/MissingDependent.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/MissingDependent.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/MissingDependent.java diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/StrConcatApp.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/StrConcatApp.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/StrConcatApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/StrConcatApp.java diff --git a/test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/TestJIT.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/TestJIT.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/dynamicArchive/test-classes/TestJIT.java rename to test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/TestJIT.java diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDump.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDump.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDump.java rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDump.java index 392b006b2d0..4dd31b5a05c 100644 --- a/test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDump.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDump.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ * but rather classes that are not recorded in any ClassLoaderData::dictionary(), * such as classes that are generated for Lambda expressions. * See https://blogs.oracle.com/jrose/anonymous-classes-in-the-vm. - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @requires vm.cds * @requires vm.flavor != "minimal" * @modules java.base/jdk.internal.misc diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDumpTransformer.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDumpTransformer.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDumpTransformer.java rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDumpTransformer.java index 92447a276ed..056111ee328 100644 --- a/test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDumpTransformer.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDumpTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDumpTransformer.mf b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDumpTransformer.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDumpTransformer.mf rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDumpTransformer.mf diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTest.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ArrayTest.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/ArrayTest.java index 945bfe94b8c..ac08701c18b 100644 --- a/test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ArrayTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary test the ability to archive array classes and load them from the archive * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.jartool/sun.tools.jar * @compile ArrayTestHelper.java * @build sun.hotspot.WhiteBox diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTestHelper.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ArrayTestHelper.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTestHelper.java rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/ArrayTestHelper.java index 614f47e6546..40a5f347803 100644 --- a/test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTestHelper.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ArrayTestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/GCDuringDump.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDump.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/javaldr/GCDuringDump.java rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDump.java index 7cc876d2064..dff99f76bd0 100644 --- a/test/hotspot/jtreg/runtime/appcds/javaldr/GCDuringDump.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDump.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ /* * @test * @summary When dumping the CDS archive, try to cause garbage collection while classes are being loaded. - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @requires vm.cds * @requires vm.flavor != "minimal" * @modules java.base/jdk.internal.misc diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/GCDuringDumpTransformer.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDumpTransformer.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/javaldr/GCDuringDumpTransformer.java rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDumpTransformer.java index 505524ebe91..a9e18daf123 100644 --- a/test/hotspot/jtreg/runtime/appcds/javaldr/GCDuringDumpTransformer.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDumpTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/GCDuringDumpTransformer.mf b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDumpTransformer.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/javaldr/GCDuringDumpTransformer.mf rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDumpTransformer.mf diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDump.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDump.java rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java index 4510801997c..9fc4ebfed3c 100644 --- a/test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDump.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Similar to GCDuringDumping.java, this test adds the -XX:SharedArchiveConfigFile * option for testing the interaction with GC and shared strings. - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @requires vm.cds.archived.java.heap * @modules java.base/jdk.internal.misc * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDumpWb.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDumpWb.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDumpWb.java rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDumpWb.java index 3fcebe5f5ed..f0cbc1dc495 100644 --- a/test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDumpWb.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDumpWb.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/HumongousDuringDump.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDump.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/javaldr/HumongousDuringDump.java rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDump.java index 6dbc7f795c8..925986331f1 100644 --- a/test/hotspot/jtreg/runtime/appcds/javaldr/HumongousDuringDump.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDump.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ /* * @test * @summary Test how CDS dumping handles the existence of humongous G1 regions. - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @requires vm.cds.archived.java.heap * @requires vm.flavor != "minimal" * @modules java.base/jdk.internal.misc diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/HumongousDuringDumpTransformer.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDumpTransformer.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/javaldr/HumongousDuringDumpTransformer.java rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDumpTransformer.java index 2c0c250a9cd..018dbb34490 100644 --- a/test/hotspot/jtreg/runtime/appcds/javaldr/HumongousDuringDumpTransformer.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDumpTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/javaldr/HumongousDuringDumpTransformer.mf b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDumpTransformer.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/javaldr/HumongousDuringDumpTransformer.mf rename to test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDumpTransformer.mf diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/CheckUnsupportedDumpingOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/CheckUnsupportedDumpingOptions.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java index bc2e1c6515f..08d91c1fd8e 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/CheckUnsupportedDumpingOptions.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/JigsawOptionsCombo.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/JigsawOptionsCombo.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java index 357505cf82f..8b999c4c995 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/JigsawOptionsCombo.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/AppClassInCP.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/AppClassInCP.java index 1d8ff55a119..e95c4d7f20d 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/AppClassInCP.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/CustomPackage.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/CustomPackage.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/CustomPackage.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/CustomPackage.java index 81e0a4292e8..d9ecfc3c5fe 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/CustomPackage.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/CustomPackage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/MismatchedPatchModule.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/MismatchedPatchModule.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/MismatchedPatchModule.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/MismatchedPatchModule.java diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchDir.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchDir.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchDir.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchDir.java index cde9b2a07e4..3685b4e4db5 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchDir.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchDir.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchJavaBase.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchJavaBase.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchJavaBase.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchJavaBase.java diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchMain.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchMain.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchMain.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchMain.java diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/Simple.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/Simple.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java index bab573d19d4..09e42915dfc 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/Simple.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java index cc222fbdded..07fd436748b 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/TwoJars.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/TwoJars.java index eae1d054985..91839717c9f 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/TwoJars.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/BootAppendTests.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/BootAppendTests.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java index e5b6f8cc459..8aed07322fa 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/BootAppendTests.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary AppCDS tests for testing -Xbootclasspath/a * @requires vm.cds & !vm.graal.enabled - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/ClassPathTests.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/ClassPathTests.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java index cf5806f4caa..4572dfa2a72 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/ClassPathTests.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * @compile src/jdk/test/Main.java * @compile src/com/sun/tools/javac/Main.jasm * @compile src/com/sun/tools/javac/MyMain.jasm - * @compile ../../../SharedArchiveFile/javax/annotation/processing/FilerException.jasm + * @compile ../../../javax/annotation/processing/FilerException.jasm * @run driver ClassPathTests * @summary AppCDS tests for testing classpath/package conflicts */ diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java index 6dcdf62a574..bae0031795d 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java @@ -26,12 +26,12 @@ * @test * @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/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.compiler * jdk.jartool/sun.tools.jar * @compile ../../test-classes/DummyClassHelper.java * @compile ../../test-classes/java/net/HttpCookie.jasm - * @compile ../../../SharedArchiveFile/javax/annotation/processing/FilerException.jasm + * @compile ../../../javax/annotation/processing/FilerException.jasm * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * @run driver DummyClassesInBootClassPath diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java index 459be678495..64d0a3af445 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * app loader will load the class from the bootclasspath if the * "--limit-modules java.base" option is specified * @requires vm.cds & !vm.graal.enabled - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.access * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/Main.jasm b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/Main.jasm similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/Main.jasm rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/Main.jasm index efe6c4a8e6e..0fb2b48e599 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/Main.jasm +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/Main.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/MyMain.jasm b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/MyMain.jasm similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/MyMain.jasm rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/MyMain.jasm index b35231d17e9..051458983ae 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/MyMain.jasm +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/com/sun/tools/javac/MyMain.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/jdk/test/Main.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/jdk/test/Main.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/jdk/test/Main.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/jdk/test/Main.java index 76ca5700fbe..303b025fd2b 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/jdk/test/Main.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/jdk/test/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext/MyClass.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext/MyClass.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext/MyClass.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext/MyClass.java index 92e9204dce2..d19bd8ec29c 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext/MyClass.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext/MyClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext1/MyClass.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext1/MyClass.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext1/MyClass.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext1/MyClass.java index 43b24f598ee..ab70423cdba 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext1/MyClass.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/src/sun/nio/cs/ext1/MyClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddModules.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddModules.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java index ceee4aa15b0..942a52e1364 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddModules.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java @@ -25,7 +25,7 @@ /** * @test * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.compiler * jdk.jartool/sun.tools.jar * jdk.jlink diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddOpens.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddOpens.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java index cf9e11aecb0..1503b444ffc 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddOpens.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ /** * @test * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.compiler * jdk.jartool/sun.tools.jar * jdk.jlink diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java index 23788edb7cd..d1d15e5c6cf 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java @@ -25,7 +25,7 @@ /** * @test * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.compiler * jdk.jartool/sun.tools.jar * jdk.jlink diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java index 206eb6d349e..8f02a0a6d05 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ /** * @test * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.compiler * jdk.jartool/sun.tools.jar * jdk.jlink diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/JvmtiAddPath.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/JvmtiAddPath.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java index c489bfb6ccd..edb0e7f4a4d 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/JvmtiAddPath.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java @@ -26,7 +26,7 @@ * @test * @summary JvmtiEnv::AddToBootstrapClassLoaderSearch and JvmtiEnv::AddToSystemClassLoaderSearch should disable AppCDS * @requires vm.cds - * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/MainModuleOnly.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/MainModuleOnly.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java index fdf4d4a20d3..d0336d7cdd4 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/MainModuleOnly.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java @@ -25,7 +25,7 @@ /** * @test * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.compiler * jdk.jartool/sun.tools.jar * jdk.jlink diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP.java index 6b8dfca0996..47314728007 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP.java @@ -25,7 +25,7 @@ /** * @test * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.compiler * jdk.jartool/sun.tools.jar * jdk.jlink diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java index ad79801417a..c6482addb3f 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java @@ -25,7 +25,7 @@ /** * @test * @requires vm.hasJFR & vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.compiler * jdk.jartool/sun.tools.jar * jdk.jlink diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java index ccaa3b7684d..57fbfe8dd22 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.greetings/module-info.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/module-info.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.greetings/module-info.java index 93345c7ea8f..19ad004a79c 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/module-info.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.greetings/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java index 69f79a9d3ad..56b7a884c85 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.hello/module-info.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/module-info.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.hello/module-info.java index 46c92f104e8..c7bc45e4248 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/module-info.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.hello/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java index 79f2c7001de..3b61ac53a3c 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java index 4c3ae500939..b803fb95b63 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.norequires/module-info.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/module-info.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.norequires/module-info.java index 194026c0ca3..013783d9854 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/module-info.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.norequires/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java index 06b6e352ec1..707a64869de 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.simple/module-info.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/module-info.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.simple/module-info.java index dade1ee6399..addaaf66663 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/module-info.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.simple/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/org.astro/module-info.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/module-info.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/org.astro/module-info.java index 1faa33fd1e3..3c2394a7a01 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/module-info.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/org.astro/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java index 43f02ba1bff..3aad5ea265b 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/OverrideTests.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/OverrideTests.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/OverrideTests.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/OverrideTests.java diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/java.net.http/java/net/http/HttpTimeoutException.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/java.net.http/java/net/http/HttpTimeoutException.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/java.net.http/java/net/http/HttpTimeoutException.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/java.net.http/java/net/http/HttpTimeoutException.java index a1c5356e2fb..4aad4e6fb88 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/java.net.http/java/net/http/HttpTimeoutException.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/java.net.http/java/net/http/HttpTimeoutException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/java.net.http/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/java.net.http/module-info.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/java.net.http/module-info.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/java.net.http/module-info.java index 52e094e3f5f..6008a56b8f6 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/java.net.http/module-info.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/java.net.http/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/jdk.compiler/com/sun/tools/javac/Main.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/jdk.compiler/com/sun/tools/javac/Main.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/jdk.compiler/com/sun/tools/javac/Main.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/jdk.compiler/com/sun/tools/javac/Main.java index f535ccd034a..81f003e9552 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/jdk.compiler/com/sun/tools/javac/Main.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/jdk.compiler/com/sun/tools/javac/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/jdk.compiler/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/jdk.compiler/module-info.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/jdk.compiler/module-info.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/jdk.compiler/module-info.java index a9c236d7bac..1a3be66d960 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/jdk.compiler/module-info.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/jdk.compiler/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/test/jdk/test/Main.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/test/jdk/test/Main.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/test/jdk/test/Main.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/test/jdk/test/Main.java index b2098007616..b4a34fe8d3b 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/test/jdk/test/Main.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/test/jdk/test/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/test/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/test/module-info.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/test/module-info.java rename to test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/test/module-info.java index 772edc1e0e0..05623ba9832 100644 --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/overridetests/src/test/module-info.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/src/test/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/ClassFileLoadHook.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/ClassFileLoadHook.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/jvmti/ClassFileLoadHook.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/ClassFileLoadHook.java diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/ClassFileLoadHookTest.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/ClassFileLoadHookTest.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jvmti/ClassFileLoadHookTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/ClassFileLoadHookTest.java index 5b4a4263085..9791af31c75 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/ClassFileLoadHookTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/ClassFileLoadHookTest.java @@ -25,7 +25,7 @@ /* * @test * @summary Test jvmti class file loader hook interaction with AppCDS - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @requires vm.cds * @build ClassFileLoadHook * @run main/othervm/native ClassFileLoadHookTest diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationAgent.mf b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationAgent.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationAgent.mf rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationAgent.mf diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationApp.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationApp.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationApp.java diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationClassFileTransformer.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationClassFileTransformer.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationClassFileTransformer.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationClassFileTransformer.java index 64eabbaf003..362eb5b527c 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationClassFileTransformer.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationClassFileTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.IllegalClassFormatException; import java.security.ProtectionDomain; -// Note: Util is from /test/hotspot/jtreg/runtime/appcds/test-classes/TestCommon.java +// Note: Util is from /test/hotspot/jtreg/runtime/cds/appcds/test-classes/TestCommon.java public class InstrumentationClassFileTransformer implements ClassFileTransformer { public byte[] transform(ClassLoader loader, String name, Class classBeingRedefined, diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationRegisterClassFileTransformer.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationRegisterClassFileTransformer.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationRegisterClassFileTransformer.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationRegisterClassFileTransformer.java index 2d2aec74269..97f0071e834 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationRegisterClassFileTransformer.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationRegisterClassFileTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationTest.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationTest.java index 2821dc54cc7..bd43b067570 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/InstrumentationTest.java @@ -26,7 +26,7 @@ * @test * @summary Exercise the java.lang.instrument.Instrumentation APIs on classes archived * using CDS/AppCDSv1/AppCDSv2. - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @requires vm.cds * @requires vm.flavor != "minimal" * @build sun.hotspot.WhiteBox @@ -36,8 +36,8 @@ * @run main/othervm InstrumentationTest */ -// Note: TestCommon is from /test/hotspot/jtreg/runtime/appcds/TestCommon.java -// Note: Util is from /test/hotspot/jtreg/runtime/appcds/test-classes/TestCommon.java +// Note: TestCommon is from /test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java +// Note: Util is from /test/hotspot/jtreg/runtime/cds/appcds/test-classes/TestCommon.java import com.sun.tools.attach.VirtualMachine; import java.io.File; diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java index 556b6bc44b9..bdd2db5844b 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java @@ -25,7 +25,7 @@ /* * @test * @summary CDS dumping with java agent. - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes * @requires vm.cds * @requires vm.flavor != "minimal" * @modules jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/DumpingWithJvmtiAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJvmtiAgent.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/DumpingWithJvmtiAgent.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJvmtiAgent.java index 0e12a232e21..7e03c58218e 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/DumpingWithJvmtiAgent.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJvmtiAgent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @summary CDS dumping with JVMTI agent. * @requires vm.cds * @requires vm.flavor != "minimal" - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @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 diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/SimpleAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/SimpleAgent.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.java index fdf706290f0..345c38d61b0 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/SimpleAgent.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/SimpleAgent.mf b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/SimpleAgent.mf rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.mf diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/libAddToSystemCLSearchOnLoad.c b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/libAddToSystemCLSearchOnLoad.c similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/libAddToSystemCLSearchOnLoad.c rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/libAddToSystemCLSearchOnLoad.c index d7cbb534cbe..9d831f74936 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/dumpingWithAgent/libAddToSystemCLSearchOnLoad.c +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/libAddToSystemCLSearchOnLoad.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/parallelLoad/ParallelClassesTransform.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/parallelLoad/ParallelClassesTransform.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/jvmti/parallelLoad/ParallelClassesTransform.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/parallelLoad/ParallelClassesTransform.java index b7cfe22d5fc..74aed76dc3e 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/parallelLoad/ParallelClassesTransform.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/parallelLoad/ParallelClassesTransform.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java similarity index 90% rename from test/hotspot/jtreg/runtime/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java index b2193c0d05b..1877dcfbe6c 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ * @test * @summary Load app classes from CDS archive in parallel threads, * use initial transformation (CFLH) - * @library /test/lib /test/hotspot/jtreg/runtime/appcds - * /test/hotspot/jtreg/runtime/appcds/test-classes /test/hotspot/jtreg/runtime/appcds/jvmti + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds + * /test/hotspot/jtreg/runtime/cds/appcds/test-classes /test/hotspot/jtreg/runtime/cds/appcds/jvmti * /test/hotspot/jtreg/testlibrary/jvmti * @requires vm.cds * @requires !vm.graal.enabled @@ -79,7 +79,7 @@ public class ParallelLoadAndTransformTest { "TransformUtil" }; - String manifest = "../../../../testlibrary/jvmti/TransformerAgent.mf"; + String manifest = "../../../../../testlibrary/jvmti/TransformerAgent.mf"; return ClassFileInstaller.writeJar("TransformerAgent.jar", ClassFileInstaller.Manifest.fromSourceFile(manifest), diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java similarity index 71% rename from test/hotspot/jtreg/runtime/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java index 9c760ed9694..133de96261d 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,12 +26,12 @@ * @test * @summary Exercise initial transformation (class file loader hook) * with CDS/AppCDS with Interface/Implementor pair - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes - * /test/hotspot/jtreg/runtime/appcds/jvmti /test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability - * /test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses - * /test/hotspot/jtreg/runtime/SharedArchiveFile /test/hotspot/jtreg/testlibrary/jvmti - * /test/hotspot/jtreg/runtime/appcds/customLoader - * /test/hotspot/jtreg/runtime/appcds/customLoader/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes + * /test/hotspot/jtreg/runtime/cds/appcds/jvmti /test/hotspot/jtreg/runtime/cds/serviceability + * /test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses + * /test/hotspot/jtreg/runtime/cds /test/hotspot/jtreg/testlibrary/jvmti + * /test/hotspot/jtreg/runtime/cds/appcds/customLoader + * /test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes * @requires vm.cds * @requires vm.flavor != "minimal" * @requires !vm.graal.enabled diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/transformRelatedClasses/TransformRelatedClassesAppCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformRelatedClassesAppCDS.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/jvmti/transformRelatedClasses/TransformRelatedClassesAppCDS.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformRelatedClassesAppCDS.java index 174deba79de..7f10ebe2edc 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/transformRelatedClasses/TransformRelatedClassesAppCDS.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformRelatedClassesAppCDS.java @@ -94,7 +94,7 @@ public class TransformRelatedClassesAppCDS extends TransformRelatedClasses { private void prepareAgent(String[] agentClasses) throws Exception { - String manifest = "../../../../testlibrary/jvmti/TransformerAgent.mf"; + String manifest = "../../../../../testlibrary/jvmti/TransformerAgent.mf"; agentJar = ClassFileInstaller.writeJar("TransformerAgent.jar", ClassFileInstaller.Manifest.fromSourceFile(manifest), agentClasses); diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java similarity index 71% rename from test/hotspot/jtreg/runtime/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java rename to test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java index de8754b3582..4125ccf654a 100644 --- a/test/hotspot/jtreg/runtime/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,12 +26,12 @@ * @test * @summary Exercise initial transformation (class file loader hook) * with CDS/AppCDS with SubClass and SuperClass - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes - * /test/hotspot/jtreg/runtime/appcds/jvmti /test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability - * /test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses - * /test/hotspot/jtreg/runtime/SharedArchiveFile /test/hotspot/jtreg/testlibrary/jvmti - * /test/hotspot/jtreg/runtime/appcds/customLoader - * /test/hotspot/jtreg/runtime/appcds/customLoader/test-classes + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes + * /test/hotspot/jtreg/runtime/cds/appcds/jvmti /test/hotspot/jtreg/runtime/cds/serviceability + * /test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses + * /test/hotspot/jtreg/runtime/cds /test/hotspot/jtreg/testlibrary/jvmti + * /test/hotspot/jtreg/runtime/cds/appcds/customLoader + * /test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes * @requires vm.cds * @requires vm.flavor != "minimal" * @requires !vm.graal.enabled diff --git a/test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineBasic.java b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasic.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineBasic.java rename to test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasic.java index 6eca6228709..561e4fc8633 100644 --- a/test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineBasic.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineBasicTest.java b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineBasicTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java index b5c3c97b0df..36c45402dbe 100644 --- a/test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineBasicTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java @@ -27,7 +27,7 @@ * @summary Run /serviceability/jvmti/RedefineClasses/RedefineRunningMethods in AppCDS mode to * make sure class redefinition works with CDS. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/cds/appcds * @modules java.compiler * java.instrument * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineRunningMethods_Shared.java b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineRunningMethods_Shared.java rename to test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java index 9677a06c655..4b9384297a5 100644 --- a/test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineRunningMethods_Shared.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java @@ -27,7 +27,7 @@ * @summary Run /serviceability/jvmti/RedefineClasses/RedefineRunningMethods in AppCDS mode to * make sure class redefinition works with CDS. * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * @modules java.compiler * java.instrument diff --git a/test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineRunningMethods_SharedHelper.java b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_SharedHelper.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineRunningMethods_SharedHelper.java rename to test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_SharedHelper.java index ff1ffada27b..e38b6114917 100644 --- a/test/hotspot/jtreg/runtime/appcds/redefineClass/RedefineRunningMethods_SharedHelper.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_SharedHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/ExerciseGC.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/ExerciseGC.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java index f3508bcc394..d3f3a2417c0 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/ExerciseGC.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Exercise GC with shared strings * @requires vm.cds.archived.java.heap - * @library /test/hotspot/jtreg/runtime/appcds /test/lib + * @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 diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/ExtraSharedInput.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExtraSharedInput.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/ExtraSharedInput.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExtraSharedInput.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/FlagCombo.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java similarity index 92% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/FlagCombo.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java index 2826457a9b4..a54eef097be 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/FlagCombo.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @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/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * @modules java.management * jdk.jartool/sun.tools.jar @@ -39,7 +39,7 @@ * @summary Test relevant combinations of command line flags with shared strings * @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/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules java.base/jdk.internal.misc * @modules java.management * jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/HelloString.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloString.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/HelloString.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloString.java index 3c1cbbe4361..1becc010196 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/HelloString.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloString.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/HelloStringGC.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringGC.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/HelloStringGC.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringGC.java index 14732626348..74327128138 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/HelloStringGC.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringGC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/HelloStringPlus.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringPlus.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/HelloStringPlus.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringPlus.java diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java index 00acbe2ba45..960232e178c 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,7 @@ * via the -vmoptions command line option of JTREG. vm.gc==null will help the test case to discard the explicitly passed * vm options. * @requires (vm.gc=="null") - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @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 @@ -49,7 +49,7 @@ * @test * @requires vm.cds.archived.java.heap * @requires (vm.gc=="null") - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @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 @@ -61,7 +61,7 @@ * @test * @requires vm.cds.archived.java.heap * @requires (vm.gc=="null") - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @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 diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/InternSharedString.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/InternSharedString.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java index d825013b13b..39e1b94925a 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/InternSharedString.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Test shared strings together with string intern operation * @requires vm.cds.archived.java.heap - * @library /test/hotspot/jtreg/runtime/appcds /test/lib + * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib * @modules jdk.jartool/sun.tools.jar * @compile InternStringTest.java * @build sun.hotspot.WhiteBox diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/InternStringTest.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternStringTest.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/InternStringTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternStringTest.java index cc95cdf6cbe..a49bf839cab 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/InternStringTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternStringTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/InvalidFileFormat.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InvalidFileFormat.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/InvalidFileFormat.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InvalidFileFormat.java index 39df3fc513a..ec86cc91a2a 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/InvalidFileFormat.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InvalidFileFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Check most common errors in file format * @requires vm.cds.archived.java.heap - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.jartool/sun.tools.jar * @build HelloString * @run driver InvalidFileFormat diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/LargePages.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/LargePages.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java index f4704be8879..9e506a6d147 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/LargePages.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Basic shared string test with large pages * @requires vm.cds.archived.java.heap - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @modules jdk.jartool/sun.tools.jar * @build HelloString * @run driver LargePages diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/LockSharedStrings.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockSharedStrings.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/LockSharedStrings.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockSharedStrings.java index 12ea54e113e..72cadd76a05 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/LockSharedStrings.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockSharedStrings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Test locking on shared strings * @requires vm.cds.archived.java.heap - * @library /test/hotspot/jtreg/runtime/appcds /test/lib + * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib * @modules jdk.jartool/sun.tools.jar * @compile LockStringTest.java LockStringValueTest.java * @build sun.hotspot.WhiteBox diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/LockStringTest.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockStringTest.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/LockStringTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockStringTest.java diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/LockStringValueTest.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockStringValueTest.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/LockStringValueTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockStringValueTest.java index 4d1e2c1a808..dc46faea878 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/LockStringValueTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockStringValueTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java index a54765362c9..5392ff173ab 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Basic test for shared strings * @requires vm.cds.archived.java.heap - * @library /test/hotspot/jtreg/runtime/appcds /test/lib + * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib * @modules jdk.jartool/sun.tools.jar * @build HelloString * @run driver SharedStringsBasic diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasicPlus.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasicPlus.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java index 979a4a47bef..248b3f66953 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasicPlus.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Basic plus test for shared strings * @requires vm.cds.archived.java.heap - * @library /test/hotspot/jtreg/runtime/appcds /test/lib + * @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 diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsHumongous.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsHumongous.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java index fa87e3b8cd8..93e622dd366 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsHumongous.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ * @comment -- the following implies that G1 is used (by command-line or by default) * @requires vm.cds.archived.java.heap * - * @library /test/hotspot/jtreg/runtime/appcds /test/lib + * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib * @modules jdk.jartool/sun.tools.jar * @build HelloString * @build sun.hotspot.WhiteBox diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsStress.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsStress.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java index e3b737dcf86..9f0fa307f58 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsStress.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Write a lots of shared strings. * @requires vm.cds.archived.java.heap - * @library /test/hotspot/jtreg/runtime/appcds /test/lib + * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib * @modules jdk.jartool/sun.tools.jar * @build HelloString * @run driver/timeout=500 SharedStringsStress diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsUtils.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsUtils.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java index 5d987cd743e..451ddf36a52 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsUtils.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWb.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWb.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWb.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWb.java index 3bd8eeb6152..c622a5f9766 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWb.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWb.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWbTest.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java similarity index 93% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWbTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java index de4c811ad2a..c749dace595 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsWbTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary White box test for shared strings * @requires vm.cds.archived.java.heap - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @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 diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java index fb8b5afbfa9..a5661738926 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java @@ -28,7 +28,7 @@ * @bug 8098821 * @requires vm.cds.archived.java.heap * @modules jdk.jartool/sun.tools.jar - * @library /test/lib /test/hotspot/jtreg/runtime/appcds + * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @run driver SysDictCrash */ diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/CorruptDataLine.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/CorruptDataLine.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/CorruptDataLine.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/CorruptDataLine.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidDataType.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidDataType.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidDataType.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidDataType.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidHeader.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidHeader.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidHeader.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidHeader.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidString.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidString.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidString.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidString.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidStringFormat.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidStringFormat.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidStringFormat.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidStringFormat.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidSymbol.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidSymbol.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidSymbol.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidSymbol.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidSymbolFormat.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidSymbolFormat.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidSymbolFormat.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidSymbolFormat.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidVersion.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidVersion.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/InvalidVersion.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/InvalidVersion.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/LengthOverflow.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/LengthOverflow.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/LengthOverflow.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/LengthOverflow.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/OverflowPrefix.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/OverflowPrefix.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/OverflowPrefix.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/OverflowPrefix.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/TruncatedString.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/TruncatedString.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/TruncatedString.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/TruncatedString.txt diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/UnrecognizedPrefix.txt b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/UnrecognizedPrefix.txt similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/sharedStrings/invalidFormat/UnrecognizedPrefix.txt rename to test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/invalidFormat/UnrecognizedPrefix.txt diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/ArrayListTest.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ArrayListTest.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/ArrayListTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/ArrayListTest.java index d6ac26e960a..5c441e9c30e 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/ArrayListTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ArrayListTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/BootClassPathAppendHelper.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/BootClassPathAppendHelper.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/BootClassPathAppendHelper.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/BootClassPathAppendHelper.java index 79cd2805ee3..ac75598ae9a 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/BootClassPathAppendHelper.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/BootClassPathAppendHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/C1.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/C1.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/C1.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/C1.java index 86201cd4e34..f61fff6e52d 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/C1.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/C1.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/C2.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/C2.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/C2.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/C2.java index ad0026fbc53..b8458b1df63 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/C2.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/C2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/Child.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Child.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/Child.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/Child.java index 8a3684e15a6..7275f7e1947 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/Child.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Child.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr1.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr1.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr1.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr1.java index 5006870cd6d..9aa323b3e18 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr1.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr1.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr2.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr2.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr2.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr2.java index 4777e1caf9e..4e6a4947808 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr2.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr3.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr3.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr3.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr3.java index 96b19d0424c..1f2bd8a69aa 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr3.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr3.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr4.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr4.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr4.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr4.java index 9711148f877..b053ed5c7b1 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr4.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr4.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr5.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr5.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr5.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr5.java index 94812653c48..1e8551d663e 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/CpAttr5.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/CpAttr5.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/DummyClassHelper.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/DummyClassHelper.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/test-classes/DummyClassHelper.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/DummyClassHelper.java diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/EmptyClassHelper.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/EmptyClassHelper.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/test-classes/EmptyClassHelper.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/EmptyClassHelper.java index a56e1593ff0..1986513fa3f 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/EmptyClassHelper.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/EmptyClassHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/FieldAnnotationsApp.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/FieldAnnotationsApp.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/FieldAnnotationsApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/FieldAnnotationsApp.java index 70808d8af64..82579156ad1 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/FieldAnnotationsApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/FieldAnnotationsApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/ForNameTest.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ForNameTest.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/ForNameTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/ForNameTest.java index e91c264b4ca..ebc105f8564 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/ForNameTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ForNameTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/GenericTestApp.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/GenericTestApp.java similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/test-classes/GenericTestApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/GenericTestApp.java diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/GetFlightRecorder.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/GetFlightRecorder.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/test-classes/GetFlightRecorder.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/GetFlightRecorder.java index ccdbe2d4318..6949f7bf94e 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/GetFlightRecorder.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/GetFlightRecorder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/Greet.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Greet.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/Greet.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/Greet.java index 174e97ac205..d5ad4feb7d5 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/Greet.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Greet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/Hello.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Hello.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/Hello.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/Hello.java index dc134771ba5..250a63adde8 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/Hello.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Hello.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/HelloExt.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloExt.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/test-classes/HelloExt.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloExt.java index 6a09f0fdcd8..c542b6f359a 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/HelloExt.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloExt.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/HelloExtApp.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloExtApp.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/HelloExtApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloExtApp.java index a4dd73f390b..334b6c25327 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/HelloExtApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloExtApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/HelloExtExt.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloExtExt.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/HelloExtExt.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloExtExt.java index d74901c782a..04b260f65cb 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/HelloExtExt.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloExtExt.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/HelloMore.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloMore.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/HelloMore.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloMore.java index dee1b239177..de85a38c4d1 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/HelloMore.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloMore.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/HelloWB.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloWB.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/test-classes/HelloWB.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloWB.java index 420329ee3ca..4039d8f9c64 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/HelloWB.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloWB.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/Hi.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Hi.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/test-classes/Hi.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/Hi.java index 8250c323a8b..2973e48ce71 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/Hi.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Hi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/Iloadw.jasm b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Iloadw.jasm similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/Iloadw.jasm rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/Iloadw.jasm index 90d31f9fbf6..30b4f58988a 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/Iloadw.jasm +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Iloadw.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/IloadwMain.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/IloadwMain.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/test-classes/IloadwMain.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/IloadwMain.java index 315e00a2b38..ac2ccbe368e 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/IloadwMain.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/IloadwMain.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/JimageClassPackage.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassPackage.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/test-classes/JimageClassPackage.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassPackage.java index f9358a1e28f..aedb07db0aa 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/JimageClassPackage.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassPackage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/JimageClassProtDomain.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassProtDomain.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/test-classes/JimageClassProtDomain.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassProtDomain.java index 4e4eef965d3..dc85daeba1c 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/JimageClassProtDomain.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassProtDomain.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/JvmtiApp.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JvmtiApp.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/test-classes/JvmtiApp.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/JvmtiApp.java index fda99bb94da..af6c27e4341 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/JvmtiApp.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JvmtiApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/MethodNoReturn.jasm b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/MethodNoReturn.jasm similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/test-classes/MethodNoReturn.jasm rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/MethodNoReturn.jasm index c9c17a50473..3bc4d60545c 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/MethodNoReturn.jasm +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/MethodNoReturn.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/MissingSuper.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/MissingSuper.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/MissingSuper.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/MissingSuper.java index ef47a7cb9e4..44575ad02dd 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/MissingSuper.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/MissingSuper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/MultiProcClass.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/MultiProcClass.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/test-classes/MultiProcClass.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/MultiProcClass.java index cf67318a24e..f9066f6d31f 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/MultiProcClass.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/MultiProcClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/MyAnnotation.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/MyAnnotation.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/MyAnnotation.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/MyAnnotation.java index cbec72aecf6..33446d221dc 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/MyAnnotation.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/MyAnnotation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/MyThread.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/MyThread.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/MyThread.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/MyThread.java index 4e482a77b04..7d9663ee468 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/MyThread.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/MyThread.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/PackageSealingTest.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/PackageSealingTest.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/PackageSealingTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/PackageSealingTest.java index a1e8ea0a234..18ea8ec5b34 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/PackageSealingTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/PackageSealingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/PackageTest.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/PackageTest.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/PackageTest.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/PackageTest.java index f5f1f15014b..87251a6ab95 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/PackageTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/PackageTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/ParallelClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ParallelClasses.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/ParallelClasses.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/ParallelClasses.java index a4d0520f235..ceeefc83ee8 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/ParallelClasses.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ParallelClasses.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/ParallelLoad.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ParallelLoad.java similarity index 99% rename from test/hotspot/jtreg/runtime/appcds/test-classes/ParallelLoad.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/ParallelLoad.java index d47c3343845..266f2621471 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/ParallelLoad.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ParallelLoad.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/Prohibited.jasm b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Prohibited.jasm similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/Prohibited.jasm rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/Prohibited.jasm index 175462b46a7..201a97dc7b6 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/Prohibited.jasm +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Prohibited.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/ProhibitedHelper.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ProhibitedHelper.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/ProhibitedHelper.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/ProhibitedHelper.java index ea22b2041ed..de08869538c 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/ProhibitedHelper.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ProhibitedHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/ProtDomain.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ProtDomain.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/ProtDomain.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/ProtDomain.java index df8d11eb263..5dd9f8f7b53 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/ProtDomain.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ProtDomain.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/ProtDomainB.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ProtDomainB.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/ProtDomainB.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/ProtDomainB.java index e2f5a29f221..1b8457e8385 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/ProtDomainB.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ProtDomainB.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/ReportMyLoader.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ReportMyLoader.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/test-classes/ReportMyLoader.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/ReportMyLoader.java index 2b1b0892a39..d2bd75aa0c6 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/ReportMyLoader.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ReportMyLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/RewriteBytecodes.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/RewriteBytecodes.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/test-classes/RewriteBytecodes.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/RewriteBytecodes.java index 787b51fa93c..d55e0082337 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/RewriteBytecodes.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/RewriteBytecodes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/Super.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Super.java similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/Super.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/Super.java index ba698c616bf..37a29e95a2b 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/Super.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Super.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/TestClassLoader.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/TestClassLoader.java similarity index 96% rename from test/hotspot/jtreg/runtime/appcds/test-classes/TestClassLoader.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/TestClassLoader.java index 29507956a27..6b5c44362f3 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/TestClassLoader.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/TestClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/TestWithProfilerHelper.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/TestWithProfilerHelper.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/test-classes/TestWithProfilerHelper.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/TestWithProfilerHelper.java index fe020305379..d069a964231 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/TestWithProfilerHelper.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/TestWithProfilerHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/TrySwitchMyLoader.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/TrySwitchMyLoader.java similarity index 95% rename from test/hotspot/jtreg/runtime/appcds/test-classes/TrySwitchMyLoader.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/TrySwitchMyLoader.java index 48a455debd0..6dc739ce01f 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/TrySwitchMyLoader.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/TrySwitchMyLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/Util.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Util.java similarity index 98% rename from test/hotspot/jtreg/runtime/appcds/test-classes/Util.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/Util.java index 29bb3b2b06e..48aada81fae 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/Util.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/Util.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/VerifierTest0.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/VerifierTest0.java similarity index 97% rename from test/hotspot/jtreg/runtime/appcds/test-classes/VerifierTest0.java rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/VerifierTest0.java index ec60232a229..328998913e1 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/VerifierTest0.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/VerifierTest0.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/com/sun/tools/javac/Main.jasm b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/com/sun/tools/javac/Main.jasm similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/com/sun/tools/javac/Main.jasm rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/com/sun/tools/javac/Main.jasm index aa70583fd4b..4b5d4953ba3 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/com/sun/tools/javac/Main.jasm +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/com/sun/tools/javac/Main.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/cpattr1.mf b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr1.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/test-classes/cpattr1.mf rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr1.mf diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/cpattr1_long.mf b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr1_long.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/test-classes/cpattr1_long.mf rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr1_long.mf diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/cpattr2.mf b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr2.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/test-classes/cpattr2.mf rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr2.mf diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/cpattr3.mf b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr3.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/test-classes/cpattr3.mf rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr3.mf diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/cpattr4.mf b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr4.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/test-classes/cpattr4.mf rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr4.mf diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/cpattr5_extra_long.mf b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr5_extra_long.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/test-classes/cpattr5_extra_long.mf rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/cpattr5_extra_long.mf diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/java/net/HttpCookie.jasm b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/java/net/HttpCookie.jasm similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/java/net/HttpCookie.jasm rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/java/net/HttpCookie.jasm index 6ef9b92f41f..f62929a159c 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/java/net/HttpCookie.jasm +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/java/net/HttpCookie.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/javax/transaction/InvalidTransactionException.jasm b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/javax/transaction/InvalidTransactionException.jasm similarity index 94% rename from test/hotspot/jtreg/runtime/appcds/test-classes/javax/transaction/InvalidTransactionException.jasm rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/javax/transaction/InvalidTransactionException.jasm index 5f2683903da..f6e2e69b676 100644 --- a/test/hotspot/jtreg/runtime/appcds/test-classes/javax/transaction/InvalidTransactionException.jasm +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/javax/transaction/InvalidTransactionException.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/package_seal.mf b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/package_seal.mf similarity index 100% rename from test/hotspot/jtreg/runtime/appcds/test-classes/package_seal.mf rename to test/hotspot/jtreg/runtime/cds/appcds/test-classes/package_seal.mf diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/javax/annotation/processing/FilerException.jasm b/test/hotspot/jtreg/runtime/cds/javax/annotation/processing/FilerException.jasm similarity index 94% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/javax/annotation/processing/FilerException.jasm rename to test/hotspot/jtreg/runtime/cds/javax/annotation/processing/FilerException.jasm index e34d2542b09..d9868928513 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/javax/annotation/processing/FilerException.jasm +++ b/test/hotspot/jtreg/runtime/cds/javax/annotation/processing/FilerException.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/javax/sound/sampled/MyClass.jasm b/test/hotspot/jtreg/runtime/cds/javax/sound/sampled/MyClass.jasm similarity index 94% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/javax/sound/sampled/MyClass.jasm rename to test/hotspot/jtreg/runtime/cds/javax/sound/sampled/MyClass.jasm index 5e6078cbee2..9367bd952cb 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/javax/sound/sampled/MyClass.jasm +++ b/test/hotspot/jtreg/runtime/cds/javax/sound/sampled/MyClass.jasm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/nonjdk/myPackage/MyClass.java b/test/hotspot/jtreg/runtime/cds/nonjdk/myPackage/MyClass.java similarity index 93% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/nonjdk/myPackage/MyClass.java rename to test/hotspot/jtreg/runtime/cds/nonjdk/myPackage/MyClass.java index 265457ca70c..2b2a4cc4375 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/nonjdk/myPackage/MyClass.java +++ b/test/hotspot/jtreg/runtime/cds/nonjdk/myPackage/MyClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/ReplaceCriticalClasses.java b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java similarity index 100% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/ReplaceCriticalClasses.java rename to test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/ReplaceCriticalClassesForSubgraphs.java b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java similarity index 96% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/ReplaceCriticalClassesForSubgraphs.java rename to test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java index eadc0207086..68efc0af1de 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/ReplaceCriticalClassesForSubgraphs.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Implementor.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/Implementor.java similarity index 94% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Implementor.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/Implementor.java index 96320a39468..0eb9d64bfd8 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Implementor.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/Implementor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Interface.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/Interface.java similarity index 93% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Interface.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/Interface.java index 1510915ca26..483d6095900 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/Interface.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/Interface.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SubClass.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/SubClass.java similarity index 94% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SubClass.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/SubClass.java index e9205918b0b..3b27fa4497b 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SubClass.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/SubClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SuperClazz.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/SuperClazz.java similarity index 94% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SuperClazz.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/SuperClazz.java index a3224c7f91e..651eaadf3d0 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/SuperClazz.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/SuperClazz.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TestEntry.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TestEntry.java similarity index 95% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TestEntry.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TestEntry.java index b388af2a15c..14ff0e820e9 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TestEntry.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TestEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java similarity index 94% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java index aa27164aade..c2f96012b78 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test * @summary Exercise initial transformation (ClassFileLoadHook) * with CDS with Interface/Implementor pair - * @library /test/lib /runtime/SharedArchiveFile /testlibrary/jvmti + * @library /test/lib /runtime/cds /testlibrary/jvmti * @requires vm.cds * @requires vm.flavor != "minimal" * @requires !vm.graal.enabled diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformRelatedClasses.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformRelatedClasses.java similarity index 99% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformRelatedClasses.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformRelatedClasses.java index 80928074595..c99691a5e44 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformRelatedClasses.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformRelatedClasses.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java similarity index 94% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java index 77e06da9cae..277f70b6e17 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Exercise initial transformation (ClassFileLoadHook) * with CDS with SubClass and SuperClass - * @library /test/lib /runtime/SharedArchiveFile /testlibrary/jvmti + * @library /test/lib /runtime/cds /testlibrary/jvmti * @requires vm.cds * @requires vm.flavor != "minimal" * @requires !vm.graal.enabled diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java similarity index 94% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java index 78dbf87b136..fb1af93a459 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @test * @summary Exercise initial transformation (ClassFileLoadHook) * with CDS with SubClass and SuperClass, each lives in own separate package - * @library /test/lib /runtime/SharedArchiveFile /testlibrary/jvmti + * @library /test/lib /runtime/cds /testlibrary/jvmti * @requires vm.cds * @requires vm.flavor != "minimal" * @requires !vm.graal.enabled diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformTestCommon.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformTestCommon.java similarity index 98% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformTestCommon.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformTestCommon.java index 09df9570bdd..fed8b0d18c3 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformTestCommon.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformTestCommon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java similarity index 94% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java index c04770dbc3c..f8e16822ec5 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/myPkg1/SuperClazz.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg2/SubClass.java b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/myPkg2/SubClass.java similarity index 96% rename from test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg2/SubClass.java rename to test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/myPkg2/SubClass.java index ab67b3a6bfd..14688ffe835 100644 --- a/test/hotspot/jtreg/runtime/SharedArchiveFile/serviceability/transformRelatedClasses/myPkg2/SubClass.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/myPkg2/SubClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it