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

Add cvm type of VM

Author: duanyangjing

cvm.mk

@@ -345,6 +345,10 @@ JT_OPTS_EXCLUDE=-exclude:$(JDK8_SRCROOT)/jdk/test/ProblemList.txt -exclude:$(CVM
 	$(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))
 
@@ -365,7 +369,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_hotspot: -setup_jtreg8 -overlay-jtreg
+test_jtreg8_hotspot: -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/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.");
     }