--- a/hotspot/test/TEST.groups	Tue Feb 28 10:51:47 2017 -0800
+++ b/hotspot/test/TEST.groups	Wed Mar 01 08:11:29 2017 -0500
@@ -21,35 +21,6 @@
 # questions.
 #
 
-# Profile-based Test Group Definitions
-#
-# These groups define the tests that cover the different possible runtimes:
-# - compact1, compact2, compact3, full JRE, JDK
-#
-# In addition they support testing of the minimal VM on compact1 and compact2.
-# Essentially this defines groups based around the specified API's and VM
-# services available in the runtime.
-#
-# The groups are defined hierarchically in two forms:
-# - The need_xxx groups list all the tests that have a dependency on
-# a specific profile. This is either because it tests a feature in
-# that profile, or the test infrastructure uses a feature in that
-# profile.
-# - The primary groups are defined in terms of the other primary groups
-# combined with the needs_xxx groups (including and excluding them as
-# appropriate). For example the jre can run all tests from compact3, plus
-# those from needs_jre, but excluding those from need_jdk.
-#
-# The bottom group defines all the actual tests to be considered, simply
-# by listing the top-level test directories.
-#
-# To use a group simply list it on the jtreg command line eg:
-#   jtreg :jdk
-# runs all tests. While
-#   jtreg :compact2
-# runs those tests that only require compact1 and compact2 API's.
-#
-
 hotspot_all = \
   /
 
@@ -72,201 +43,6 @@
  -:hotspot_runtime \
  -:hotspot_serviceability
 
-# Full JDK can run all tests
-#
-jdk = \
-  :jre \
-  :needs_jdk
-
-# Tests that require a full JDK to execute. Either they test a feature
-# only in the JDK or they use tools that are only in the JDK. The latter
-# can be resolved in some cases by using tools from the compile-jdk.
-#
-needs_jdk = \
-  compiler/aot \
-  gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java \
-  gc/metaspace/TestMetaspacePerfCounters.java \
-  gc/metaspace/TestPerfCountersAndMemoryPools.java \
-  runtime/6819213/TestBootNativeLibraryPath.java \
-  runtime/7158988/FieldMonitor.java \
-  runtime/Metaspace/FragmentMetaspace.java \
-  runtime/NMT/BaselineWithParameter.java \
-  runtime/NMT/JcmdBaselineDetail.java \
-  runtime/NMT/JcmdDetailDiff.java \
-  runtime/NMT/JcmdScaleDetail.java \
-  runtime/NMT/JcmdScale.java \
-  runtime/NMT/JcmdSummaryDiff.java \
-  runtime/NMT/JcmdWithNMTDisabled.java \
-  runtime/NMT/MallocRoundingReportTest.java \
-  runtime/NMT/MallocSiteHashOverflow.java \
-  runtime/NMT/MallocStressTest.java \
-  runtime/NMT/MallocTestType.java \
-  runtime/NMT/MallocTrackingVerify.java \
-  runtime/NMT/ReleaseCommittedMemory.java \
-  runtime/NMT/ReleaseNoCommit.java \
-  runtime/NMT/ShutdownTwice.java \
-  runtime/NMT/SummaryAfterShutdown.java \
-  runtime/NMT/SummarySanityCheck.java \
-  runtime/NMT/ThreadedMallocTestType.java \
-  runtime/NMT/ThreadedVirtualAllocTestType.java \
-  runtime/NMT/VirtualAllocCommitUncommitRecommit.java \
-  runtime/NMT/VirtualAllocTestType.java \
-  runtime/RedefineObject/TestRedefineObject.java \
-  runtime/Thread/TestThreadDumpMonitorContention.java \
-  runtime/Thread/ThreadPriorities.java \
-  runtime/XCheckJniJsig/XCheckJSig.java \
-  serviceability/attach/AttachWithStalePidFile.java \
-  serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java \
-  serviceability/dcmd/vm/DynLibsTest.java \
-  serviceability/tmtools
-
-
-# JRE adds further tests to compact3
-#
-jre = \
-  :compact3 \
-  :needs_jre \
- -:needs_jdk
-
-# Tests that require the full JRE
-#
-needs_jre = \
-  compiler/c2/Test6852078.java \
-  compiler/c2/Test7047069.java \
-  runtime/6294277/SourceDebugExtension.java \
-  runtime/ClassFile/JsrRewriting.java \
-  runtime/ClassFile/OomWhileParsingRepeatedJsr.java \
-  runtime/SharedArchiveFile/LimitSharedSizes.java \
-  runtime/SharedArchiveFile/SpaceUtilizationCheck.java
-
-# Compact 3 adds further tests to compact2
-#
-compact3 = \
-  :compact2 \
-  :needs_compact3 \
- -:needs_jre \
- -:needs_jdk
-
-
-# Tests that require compact3 API's
-#
-needs_compact3 = \
-  gc/TestFullGCCount.java \
-  gc/arguments/TestG1HeapRegionSize.java \
-  gc/arguments/TestDynMinHeapFreeRatio.java \
-  gc/arguments/TestDynMaxHeapFreeRatio.java \
-  gc/cms/TestMBeanCMS.java \
-  gc/g1/TestHumongousAllocInitialMark.java \
-  gc/g1/TestShrinkAuxiliaryData00.java \
-  gc/g1/TestShrinkAuxiliaryData05.java \
-  gc/g1/TestShrinkAuxiliaryData10.java \
-  gc/g1/TestShrinkAuxiliaryData15.java \
-  gc/g1/TestShrinkAuxiliaryData20.java \
-  gc/g1/TestShrinkAuxiliaryData25.java \
-  gc/g1/TestShrinkAuxiliaryData30.java \
-  gc/metaspace/TestMetaspaceMemoryPool.java \
-  gc/survivorAlignment \
-  runtime/InternalApi/ThreadCpuTimesDeadlock.java \
-  runtime/NMT/JcmdSummaryDiff.java \
-  runtime/RedefineTests/RedefineAnnotations.java \
-  serviceability/threads/TestFalseDeadLock.java \
-  compiler/codecache/jmx \
-  compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java \
-  compiler/rangechecks/TestRangeCheckSmearing.java \
-  compiler/whitebox/DeoptimizeMultipleOSRTest.java \
-  serviceability/dcmd \
-  testlibrary_tests/whitebox/vm_flags
-
-# Compact 2 adds full VM tests
-compact2 = \
-  :compact2_minimal \
-  :compact1 \
-  :needs_full_vm_compact2 \
- -:needs_compact3 \
- -:needs_jre \
- -:needs_jdk
-
-# Tests that require compact2 API's and a full VM
-#
-needs_full_vm_compact2 =
-
-# Compact 1 adds full VM tests
-#
-compact1 = \
-  :compact1_minimal \
-  :needs_full_vm_compact1 \
- -:needs_compact2 \
- -:needs_full_vm_compact2 \
- -:needs_compact3 \
- -:needs_jre \
- -:needs_jdk
-
-# Tests that require compact1 API's and a full VM
-#
-needs_full_vm_compact1 = \
-  runtime/NMT \
-  gc/g1/TestRegionAlignment.java \
-  gc/g1/TestShrinkToOneRegion.java \
-  gc/metaspace/G1AddMetaspaceDependency.java \
-  gc/startup_warnings/TestCMS.java \
-  gc/startup_warnings/TestParallelGC.java \
-  gc/startup_warnings/TestParallelScavengeSerialOld.java \
-  runtime/SharedArchiveFile/SharedArchiveFile.java
-
-# Minimal VM on Compact 2 adds in some compact2 tests
-#
-compact2_minimal = \
-  :compact1_minimal \
-  :needs_compact2 \
- -:needs_full_vm_compact2 \
- -:needs_compact3 \
- -:needs_jre \
- -:needs_jdk
-
-# Tests that require compact2 API's
-#
-needs_compact2 = \
-  compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java
-
-# All tests that run on the most minimal configuration: Minimal VM on Compact 1
-compact1_minimal = \
-  serviceability/ \
-  compiler/ \
-  sanity/ \
-  runtime/ \
-  gc/ \
- -:needs_full_vm_compact1 \
- -:needs_full_vm_compact2 \
- -:needs_compact2 \
- -:needs_compact3 \
- -:needs_jre \
- -:needs_jdk
-
-# All tests that explicitly set the G1 GC
-#
-needs_g1gc = \
-  compiler/regalloc/C1ObjectSpillInLogicOp.java \
-  gc/TestHumongousReferenceObject.java \
-  gc/TestSmallHeap.java \
-  gc/TestSystemGC.java \
-  gc/arguments/TestAlignmentToUseLargePages.java \
-  gc/arguments/TestG1ConcRefinementThreads.java \
-  gc/arguments/TestG1HeapRegionSize.java \
-  gc/arguments/TestG1HeapSizeFlags.java \
-  gc/arguments/TestG1PercentageOptions.java \
-  gc/arguments/TestMaxHeapSizeTools.java \
-  gc/arguments/TestMaxNewSize.java \
-  gc/arguments/TestParallelGCThreads.java \
-  gc/arguments/TestUseCompressedOopsErgo.java \
-  gc/class_unloading/TestG1ClassUnloadingHWM.java \
-  gc/ergonomics/TestDynamicNumberOfGCThreads.java \
-  gc/g1/ \
-  gc/logging/TestGCId.java \
-  gc/metaspace/G1AddMetaspaceDependency.java \
-  gc/metaspace/TestMetaspacePerfCounters.java \
-  gc/startup_warnings/TestG1.java \
-  gc/whitebox/TestConcMarkCycleWB.java
-
 hotspot_native_sanity = \
   native_sanity
 
@@ -447,17 +223,3 @@
   runtime/MinimalVM \
   runtime/ErrorHandling \
   runtime/logging
-
-#All tests that depends on nashorn extension.
-#
-needs_nashorn = \
-  compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java
-
-#All tests that do not depends on nashorn extension
-#
-not_needs_nashorn = \
-  :jdk \
-  -:needs_nashorn
-
-hotspot_tmtools = \
-  serviceability/tmtools