cvm/overlay: (2/2) Fix Unknown VM error in hotspot test

Add cvm type of VM in hotspot test framework

Author: duanyangjing

cvm.mk

@@ -356,6 +356,10 @@ endif
 	$(call overlay_single,jdk8u,langtools/test/tools/javac/annotations/8218152/MalformedAnnotationProcessorTests.java, $(JDK8_SRCROOT))
 	$(call overlay_single,jdk8u,langtools/test/tools/javac/6508981/TestInferBinaryName.java, $(JDK8_SRCROOT))
 
+-overlay-hotspot8:
+	$(call overlay_single,jdk8u,hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java, $(JDK8_SRCROOT))
+	$(call overlay_single,jdk8u,hotspot/test/testlibrary/com/oracle/java/testlibrary/cli/CommandLineOptionTest.java, $(JDK8_SRCROOT))
+
 -overlay-jtreg:
 	$(call overlay_single,jdk8u,test/jtreg-ext/requires/VMProps.java, $(JDK8_SRCROOT))
 
@@ -376,7 +380,7 @@ test_jtreg8_jdk_core: -setup_jtreg8 -overlay-jdk8
 	$(eval JT_TEST = ":jdk_core")
 	$(call run_jtreg8_test,$(JDK8_SRCROOT)/jdk/test,$(JT_TEST),$(JT_OPTS_EXCLUDE))
 
-test_jtreg8_hotspot8: -setup_jtreg8 -overlay-jtreg
+test_jtreg8_hotspot8: -setup_jtreg8 -overlay-jtreg -overlay-hotspot8
 	$(eval JT_REPO = hotspot)
 	$(call run_jtreg8_test,$(JDK8_SRCROOT)/$(JT_REPO)/test,$(JT_TEST),$(JT_OPTS_EXCLUDE))
 

cvm/conf/jtreg_hotspot8_excludes_aarch64.list

@@ -186,4 +186,3 @@ compiler/7184394/TestAESMain.java
 compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
 compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java
 compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java
-compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java

cvm/conf/jtreg_hotspot8_excludes_x64.list

@@ -32,15 +32,9 @@ compiler/profiling/spectrapredefineclass/Launcher.java
 compiler/rangechecks/TestRangeCheckSmearing.java
 compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java
 compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java
-compiler/rtm/cli/TestRTMAbortThresholdOption.java
-compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java
-compiler/rtm/cli/TestRTMLockingThresholdOption.java
-compiler/rtm/cli/TestRTMRetryCountOption.java
-compiler/rtm/cli/TestRTMSpinLoopCountOption.java
 compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java
 compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java
 compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java
-compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java
 compiler/stable/TestStableBoolean.java
 compiler/stable/TestStableChar.java
 compiler/stable/TestStableByte.java
@@ -175,7 +169,6 @@ testlibrary/ctw/test/JarDirTest.java
 testlibrary/ctw/test/JarsTest.java
 testlibrary_tests/whitebox/vm_flags/DoubleTest.java
 testlibrary_tests/whitebox/vm_flags/IntxTest.java
-runtime/NMT/MallocStressTest.java
 testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
 vmTestbase/nsk/jdb/monitor/monitor002/monitor002.java
 
@@ -185,4 +178,3 @@ compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
 compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
 compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
 runtime/containers/docker/DockerBasicTest.java
-compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java

cvm/overlay/jdk8u/hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java

@@ -43,6 +43,10 @@ public static boolean isServer() {
         return vmName.endsWith(" Server VM");
     }
 
+    public static boolean isCVM() {
+        return vmName.contains("CompoundVM");
+    }
+
     public static boolean isGraal() {
         return vmName.endsWith(" Graal VM");
     }

cvm/overlay/jdk8u/hotspot/test/testlibrary/com/oracle/java/testlibrary/cli/CommandLineOptionTest.java

@@ -299,6 +299,8 @@ private static String getVMTypeOption() {
             return "-minimal";
         } else if (Platform.isGraal()) {
             return "-graal";
+        } else if (Platform.isCVM()) {
+            return "-cvm";
         }
         throw new RuntimeException("Unknown VM mode.");
     }