applied the overlay files from cvm8/master

Author: luchsh

jdk/test/com/sun/jdi/BreakpointWithFullGC.sh

@@ -120,7 +120,7 @@ jdbFailIfNotPresent 'System\..*bottom of loop'
 jdbFailIfNotPresent 'System\..*end of test'
 
 # make sure we had at least one full GC
-debuggeeFailIfNotPresent 'Full GC'
+debuggeeFailIfNotPresent 'Full GC|Pause Full'
 
 # check for error message due to thread ID change
 debuggeeFailIfPresent \

jdk/test/com/sun/jdi/RedefineCrossEvent.java

@@ -32,8 +32,6 @@
  *  @run compile -g AccessSpecifierTest.java
  *  @run compile -g AfterThreadDeathTest.java
  *  @run compile -g ArrayRangeTest.java
- *  @run compile -g BacktraceFieldTest.java
- *  @run compile -g ClassesByName2Test.java
  *  @run compile -g DebuggerThreadTest.java
  *  @run compile -g DeleteEventRequestsTest.java
  *  @run compile -g ExceptionEvents.java
@@ -49,8 +47,6 @@
  *  @run main AccessSpecifierTest -redefstart -redefevent
  *  @run main AfterThreadDeathTest -redefstart -redefevent
  *  @run main ArrayRangeTest -redefstart -redefevent
- *  @run main BacktraceFieldTest -redefstart -redefevent
- *  @run main ClassesByName2Test -redefstart -redefevent
  *  @run main DebuggerThreadTest -redefstart -redefevent
  *  @run main DeleteEventRequestsTest -redefstart -redefevent
  *  @run main/othervm ExceptionEvents -redefstart -redefevent N A StackOverflowCaughtTarg java.lang.Exception

jdk/test/java/lang/System/Versions.java

@@ -72,10 +72,12 @@ static void checkClassVersion(int major, int minor, boolean expectSupported)
     public static void main(String [] args) throws Exception {
         String classVersion   = getProperty("java.class.version");
         String javaVersion    = getProperty("java.version");
-        String VMVersion      = getProperty("java.vm.version");
+        String VMSpecVersion  = getProperty("java.vm.specification.version");
         String runtimeVersion = getProperty("java.runtime.version");
         String specVersion    = getProperty("java.specification.version");
 
+        boolean isCVM = VMSpecVersion.equals("17");
+
         if (! (javaVersion.startsWith(specVersion) &&
                runtimeVersion.startsWith(specVersion)))
             throw new Exception("Invalid version-related system properties");
@@ -95,7 +97,7 @@ public static void main(String [] args) throws Exception {
         cl = new URLClassLoader(new URL[]{new File("./").toURL()}, null);
 
         checkClassVersion(majorVersion    , minorVersion    , true );
-        checkClassVersion(majorVersion + 1, minorVersion    , false);
-        checkClassVersion(majorVersion    , minorVersion + 1, false);
+        checkClassVersion(majorVersion + 1, minorVersion    , isCVM);
+        checkClassVersion(majorVersion    , minorVersion + 1, isCVM);
     }
 }

jdk/test/sun/misc/Version/Version.java

@@ -46,7 +46,9 @@ public static void main(String[] args) throws Exception {
         if (!jdk.equals(v1)) {
             throw new RuntimeException("Unmatched version: " + jdk + " vs " + v1);
         }
-        VersionInfo jvm = jvmVersionInfo(System.getProperty("java.vm.version"));
+        VersionInfo jvm = System.getProperty("java.vm.specification.version").equals("17") ?
+                jvm17VersionInfo(System.getProperty("java.vm.version"))
+                : jvmVersionInfo(System.getProperty("java.vm.version"));
         VersionInfo v2 = new VersionInfo(jvmMajorVersion(),
                                          jvmMinorVersion(),
                                          jvmMicroVersion(),
@@ -136,6 +138,36 @@ private static VersionInfo jdkVersionInfo(String version) throws Exception {
         return vi;
     }
 
+    private static VersionInfo jvm17VersionInfo(String version) throws Exception {
+        // According to jdk-version.m4 in jdk17u
+        // valid format of the version string is:
+        // <major>[.<minor>][.<update>][.<patch>[-<version_pre>]+<build>[-<version_opt>]
+        int major = 0;
+        int minor = 0;
+        int build = 0;
+
+        String regex = "^(?<major>[0-9]{1,2})";      // major
+        regex += "(\\.";                             // separator
+        regex += "(?<minor>[0-9]{1,3})";             // minor
+        regex += ")?";                               // minor '0'  might be stripped
+        regex += "(\\.[0-9]{1,3})?(\\.[0-9]{1,3})?"; // (not important) update, patch
+        regex += "(\\-[a-zA-Z0-9]+)?";               // (not important) version_pre
+        regex += "\\+(?<build>[0-9]{1,3})";          // build
+        regex += "(\\-[a-zA-Z0-9\\.\\-]+)?$";        // (not important) version_opt
+
+        Pattern p = Pattern.compile(regex);
+        Matcher m = p.matcher(version);
+        m.matches();
+
+        major = Integer.parseInt(m.group("major"));
+        minor = m.group("minor") == null ? 0 : Integer.parseInt(m.group("minor"));
+        build = Integer.parseInt(m.group("build"));
+
+        VersionInfo vi = new VersionInfo(major, minor, 0, 0, "", build);
+        System.out.printf("jvmVersionInfo: input=%s output=%s\n", version, vi);
+        return vi;
+    }
+
     private static VersionInfo jvmVersionInfo(String version) throws Exception {
         try {
             // valid format of the version string is:

langtools/test/tools/javac/6508981/TestInferBinaryName.java

@@ -77,7 +77,8 @@ void testDirectory() throws IOException {
     }
 
     void testSymbolArchive() throws IOException {
-        String testClassName = "java.lang.String";
+        String testClassName = "8".equals(System.getProperty("java.vm.specification.version")) ?
+            "java.lang.String" : "java.lang.StringBuilder";
         JavaFileManager fm =
             getFileManager("sun.boot.class.path", USE_SYMBOL_FILE, DONT_USE_ZIP_FILE_INDEX);
         test("testSymbolArchive",

langtools/test/tools/javac/annotations/8218152/MalformedAnnotationProcessorTests.java

@@ -133,6 +133,10 @@ public void testWrongClassFileVersion(Path base) throws Exception {
             .setErrOutput(actualErrors);
         ToolBox.javac(args);
 
+        // cvm supports a higher bytecode version, so the test would not fail. Keep
+        // the higher version support and skip the test.
+        if (!System.getProperty("java.vm.specification.version").equals("8"))
+            return;
         if (!actualErrors.get(0).contains("- compiler.err.proc.cant.load.class: " +
             "WrongClassFileVersion has been compiled by a more recent version")) {
             throw new AssertionError("Unexpected errors reported: " + actualErrors);

test/jtreg-ext/requires/VMProps.java

@@ -69,7 +69,7 @@ protected String vmFlavor() {
 
         Pattern startP = Pattern.compile(".* (\\S+) VM");
         Matcher m = startP.matcher(vmName);
-        if (m.matches()) {
+        if (m.find()) {
             return m.group(1).toLowerCase();
         }
         return null;