test/hotspot/jtreg/TEST.groups

*** 207,216 ****
--- 207,217 ----
   -runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java \
   -runtime/CommandLine/PrintGCApplicationConcurrentTime.java \
   -runtime/ConstantPool/IntfMethod.java \
   -runtime/ErrorHandling/CreateCoredumpOnCrash.java \
   -runtime/ErrorHandling/ErrorHandler.java \
+  -runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java \
   -runtime/ErrorHandling/TimeoutInErrorHandlingTest.java \
   -runtime/logging/MonitorMismatchTest.java \
   -runtime/memory/ReserveMemory.java \
   -runtime/memory/RunUnitTestsConcurrently.java \
   -runtime/Metaspace/FragmentMetaspace.java \
*** 269,278 ****
--- 270,281 ----
    serviceability/dcmd/compiler \
    -serviceability/dcmd/compiler/CompilerQueueTest.java \
    serviceability/logging \
    serviceability/sa \
    -serviceability/sa/ClhsdbScanOops.java \
+   -serviceability/sa/TestJmapCore.java \
+   -serviceability/sa/TestJmapCoreMetaspace.java \
    -serviceability/sa/TestHeapDumpForLargeArray.java
  
  tier1 = \
    :tier1_common \
    :tier1_compiler \
*** 2261,2281 ****
  
  # JSR292 tests (invokedynamic AKA Multi-Language VM AKA Da Vinci Machine)
  vmTestbase_vm_mlvm = \
    vmTestbase/vm/mlvm
  
- # Heap dump tests
- vmTestbase_vm_heapdump = \
-   vmTestbase/heapdump
- 
- vmTestbase_vm_heapdump_quick = \
-   vmTestbase/heapdump/OnOOMToFile/TestDescription.java \
-   vmTestbase/heapdump/OnOOMToFileMetaspace/TestDescription.java \
-   vmTestbase/heapdump/OnOOMToPath/TestDescription.java \
-   vmTestbase/heapdump/JMapHeapCore/TestDescription.java \
-   vmTestbase/heapdump/JMapMetaspace/TestDescription.java
- 
  # Tests for attach-on-demand implementation
  vmTestbase_nsk_aod = \
    vmTestbase/nsk/aod
  
  # JDB tests
--- 2264,2273 ----