--- a/test/hotspot/jtreg/TEST.groups Thu Feb 08 21:05:35 2018 +0100
+++ b/test/hotspot/jtreg/TEST.groups Mon Mar 12 12:22:21 2018 +0100
@@ -54,11 +54,19 @@
hotspot_native_sanity = \
native_sanity
-hotspot_tier1_common = \
+hotspot_gc_epsilon = \
+ gc/epsilon/
+
+tier1_common = \
sanity/BasicVMTest.java \
gtest/GTestWrapper.java
-hotspot_tier1_compiler_1 = \
+tier1_compiler = \
+ :tier1_compiler_1 \
+ :tier1_compiler_2 \
+ :tier1_compiler_3
+
+tier1_compiler_1 = \
compiler/aot/ \
compiler/arraycopy/ \
compiler/c1/ \
@@ -74,7 +82,7 @@
-compiler/c2/Test6603011.java \
-compiler/c2/Test6912517.java \
-hotspot_tier1_compiler_2 = \
+tier1_compiler_2 = \
compiler/classUnloading/ \
compiler/codecache/ \
compiler/codegen/ \
@@ -93,7 +101,7 @@
-compiler/codecache/stress \
-compiler/gcbarriers/PreserveFPRegistersTest.java
-hotspot_tier1_compiler_3 = \
+tier1_compiler_3 = \
compiler/intrinsics/ \
compiler/jsr292/ \
compiler/loopopts/ \
@@ -116,17 +124,20 @@
hotspot_not_fast_compiler = \
:hotspot_compiler \
- -:hotspot_tier1_compiler_1 \
- -:hotspot_tier1_compiler_2 \
- -:hotspot_tier1_compiler_3 \
+ -:tier1_compiler_1 \
+ -:tier1_compiler_2 \
+ -:tier1_compiler_3 \
-hotspot_gc_epsilon = \
- gc/epsilon/
+tier1_gc = \
+ :tier1_gc_1 \
+ :tier1_gc_2 \
+ :tier1_gc_gcold \
+ :tier1_gc_gcbasher
-hotspot_tier1_gc_1 = \
+tier1_gc_1 = \
gc/g1/
-hotspot_tier1_gc_2 = \
+tier1_gc_2 = \
sanity/ExecuteInternalVMTests.java \
gc/ \
-gc/g1/ \
@@ -136,19 +147,19 @@
-gc/cms/TestMBeanCMS.java \
-gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
-hotspot_tier1_gc_gcold = \
+tier1_gc_gcold = \
gc/stress/gcold/TestGCOldWithG1.java
gc/stress/gcold/TestGCOldWithCMS.java
gc/stress/gcold/TestGCOldWithSerial.java
gc/stress/gcold/TestGCOldWithParallel.java
-hotspot_tier1_gc_gcbasher = \
+tier1_gc_gcbasher = \
gc/stress/gcbasher/TestGCBasherWithG1.java \
gc/stress/gcbasher/TestGCBasherWithCMS.java \
gc/stress/gcbasher/TestGCBasherWithSerial.java \
gc/stress/gcbasher/TestGCBasherWithParallel.java
-hotspot_tier1_runtime = \
+tier1_runtime = \
runtime/ \
-runtime/6626217/Test6626217.sh \
-runtime/7100935 \
@@ -193,7 +204,7 @@
-runtime/containers/ \
sanity/ \
testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java \
- -:hotspot_tier1_runtime_appcds_exclude
+ -:tier1_runtime_appcds_exclude
hotspot_cds = \
runtime/SharedArchiveFile/ \
@@ -205,30 +216,26 @@
runtime/appcds/
# A subset of AppCDS tests to be run in JPRT push
-hotspot_tier1_runtime_appcds = \
+tier1_runtime_appcds = \
runtime/appcds/HelloTest.java \
runtime/appcds/sharedStrings/SharedStringsBasic.java \
runtime/appcds/ClassLoaderTest.java
-hotspot_tier1_runtime_appcds_exclude = \
+tier1_runtime_appcds_exclude = \
runtime/appcds/ \
- -:hotspot_tier1_runtime_appcds
+ -:tier1_runtime_appcds
-hotspot_tier1_serviceability = \
+tier1_serviceability = \
serviceability/dcmd/compiler \
serviceability/logging \
serviceability/sa
-hotspot_tier1 = \
- :hotspot_tier1_common \
- :hotspot_tier1_compiler_1 \
- :hotspot_tier1_compiler_2 \
- :hotspot_tier1_compiler_3 \
- :hotspot_tier1_gc_1 \
- :hotspot_tier1_gc_2 \
- :hotspot_tier1_gc_gcold \
- :hotspot_tier1_runtime \
- :hotspot_tier1_serviceability
+tier1 = \
+ :tier1_common \
+ :tier1_compiler \
+ :tier1_gc \
+ :tier1_runtime \
+ :tier1_serviceability
hotspot_tier2_runtime = \
runtime/ \
@@ -236,20 +243,20 @@
-runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java \
-runtime/Thread/TestThreadDumpMonitorContention.java \
-runtime/containers/ \
- -:hotspot_tier1_runtime \
- -:hotspot_tier1_serviceability \
+ -:tier1_runtime \
+ -:tier1_serviceability \
-:hotspot_tier2_runtime_platform_agnostic
hotspot_tier2_runtime_platform_agnostic = \
runtime/SelectionResolution \
- -:hotspot_tier1_runtime
+ -:tier1_runtime
hotspot_tier3_runtime = \
runtime/ \
serviceability/ \
-runtime/containers/ \
- -:hotspot_tier1_runtime \
- -:hotspot_tier1_serviceability \
+ -:tier1_runtime \
+ -:tier1_serviceability \
-:hotspot_tier2_runtime_platform_agnostic \
-:hotspot_tier2_runtime