test/hotspot/jtreg/TEST.groups

@@ -294,71 +294,66 @@
  -runtime/SelectionResolution/InvokeSpecialICCE.java \
  -runtime/SelectionResolution/InvokeSpecialSuccessTest.java \
  -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 \
   sanity/ \
   testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java \
  -:tier1_runtime_appcds_exclude \
  -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/ \
+ -runtime/cds/cacheObject \
+ -runtime/cds/customLoader \
+ -runtime/cds/dynamicArchive \
+ -runtime/cds/javaldr/ArrayTest.java \
+ -runtime/cds/javaldr/GCSharedStringsDuringDump.java \
+ -runtime/cds/javaldr/HumongousDuringDump.java \
+ -runtime/cds/sharedStrings \
+ -runtime/cds/DumpClassList.java \
+ -runtime/cds/ExtraSymbols.java \
+ -runtime/cds/LongClassListPath.java \
+ -runtime/cds/LotsOfClasses.java \
+ -runtime/cds/RelativePath.java \
+ -runtime/cds/SharedArchiveConsistency.java \
+ -runtime/cds/UnusedCPDuringDump.java \
+ -runtime/cds/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/HelloTest.java \
+  runtime/cds/sharedStrings/SharedStringsBasic.java \
+  runtime/cds/ClassLoaderTest.java
 
 tier1_runtime_appcds_exclude = \
-  runtime/appcds/ \
+  runtime/cds/ \
   -:tier1_runtime_appcds
 
 # This group should be executed with "jtreg -Dtest.cds.run.with.jfr=true ..."
 # to test interaction between AppCDS and JFR. It also has the side effect of
 # testing JVMTI ClassFileLoadHook.
 #
 # 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/ \
+ -runtime/cds/cacheObject/ArchivedModuleCompareTest.java \
+ -runtime/cds/jigsaw/classpathtests/BootAppendTests.java \
+ -runtime/cds/jigsaw/classpathtests/ClassPathTests.java \
+ -runtime/cds/jigsaw/classpathtests/EmptyClassInBootClassPath.java \
+ -runtime/cds/jigsaw/JigsawOptionsCombo.java \
+ -runtime/cds/jigsaw/modulepath/MainModuleOnly.java
 
 tier1_serviceability = \
   serviceability/dcmd/compiler \
   -serviceability/dcmd/compiler/CompilerQueueTest.java \
   serviceability/jvmti/RedefineClasses \