--- old/test/hotspot/jtreg/runtime/appcds/javaldr/AnonVmClassesDuringDump.java	2019-07-24 08:27:26.469469098 -0400
+++ /dev/null	2019-07-22 09:37:15.068007775 -0400
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/*
- * @test
- * @summary When dumping the CDS archive, try to load VM anonymous classes to make sure they
- *          are handled properly. Note: these are not "anonymous inner classes" in the Java source code,
- *          but rather classes that are not recorded in any ClassLoaderData::dictionary(),
- *          such as classes that are generated for Lambda expressions.
- *          See https://blogs.oracle.com/jrose/anonymous-classes-in-the-vm.
- * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes
- * @requires vm.cds
- * @requires vm.flavor != "minimal"
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
- * @build AnonVmClassesDuringDumpTransformer Hello
- * @run main/othervm AnonVmClassesDuringDump
- */
-
-public class AnonVmClassesDuringDump {
-    public static String appClasses[] = {
-        "Hello",
-    };
-    public static String agentClasses[] = {
-        "AnonVmClassesDuringDumpTransformer",
-    };
-
-    public static String cdsDiagnosticOption = "-XX:+AllowArchivingWithJavaAgent";
-
-    public static void main(String[] args) throws Throwable {
-        String agentJar =
-            ClassFileInstaller.writeJar("AnonVmClassesDuringDumpTransformer.jar",
-                                        ClassFileInstaller.Manifest.fromSourceFile("AnonVmClassesDuringDumpTransformer.mf"),
-                                        agentClasses);
-
-        String appJar =
-            ClassFileInstaller.writeJar("AnonVmClassesDuringDumpApp.jar", appClasses);
-
-        TestCommon.testDump(appJar, TestCommon.list("Hello"),
-                            "-javaagent:" + agentJar,
-                            "-XX:+UnlockDiagnosticVMOptions", cdsDiagnosticOption,
-                            // Set the following property to see logs for dynamically generated classes
-                            // in STDOUT
-                            "-Djava.lang.invoke.MethodHandle.DUMP_CLASS_FILES=true");
-
-        String prefix = ".class.load. ";
-        // class name pattern like the following:
-        // jdk.internal.loader.BuiltinClassLoader$$Lambda$1/1816757085
-        // java.lang.invoke.LambdaForm$MH/1585787493
-        String class_pattern = ".*Lambda([a-z0-9$]+)/([0-9]+).*";
-        String suffix = ".*source: shared objects file.*";
-        String pattern = prefix + class_pattern + suffix;
-        // during run time, anonymous classes shouldn't be loaded from the archive
-        TestCommon.run("-cp", appJar,
-            "-XX:+UnlockDiagnosticVMOptions", cdsDiagnosticOption, "Hello")
-            .assertNormalExit(output -> output.shouldNotMatch(pattern));
-
-        // inspect the archive and make sure no anonymous class is in there
-        TestCommon.run("-cp", appJar,
-            "-XX:+UnlockDiagnosticVMOptions", cdsDiagnosticOption,
-            "-XX:+PrintSharedArchiveAndExit", "-XX:+PrintSharedDictionary", "Hello")
-            .assertNormalExit(output -> output.shouldNotMatch(class_pattern));
-    }
-}
-
--- /dev/null	2019-07-22 09:37:15.068007775 -0400
+++ new/test/hotspot/jtreg/runtime/cds/javaldr/AnonVmClassesDuringDump.java	2019-07-24 08:27:26.181469108 -0400
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @summary When dumping the CDS archive, try to load VM anonymous classes to make sure they
+ *          are handled properly. Note: these are not "anonymous inner classes" in the Java source code,
+ *          but rather classes that are not recorded in any ClassLoaderData::dictionary(),
+ *          such as classes that are generated for Lambda expressions.
+ *          See https://blogs.oracle.com/jrose/anonymous-classes-in-the-vm.
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds /test/hotspot/jtreg/runtime/cds/test-classes
+ * @requires vm.cds
+ * @requires vm.flavor != "minimal"
+ * @modules java.base/jdk.internal.misc
+ *          jdk.jartool/sun.tools.jar
+ *          java.management
+ * @build AnonVmClassesDuringDumpTransformer Hello
+ * @run main/othervm AnonVmClassesDuringDump
+ */
+
+public class AnonVmClassesDuringDump {
+    public static String appClasses[] = {
+        "Hello",
+    };
+    public static String agentClasses[] = {
+        "AnonVmClassesDuringDumpTransformer",
+    };
+
+    public static String cdsDiagnosticOption = "-XX:+AllowArchivingWithJavaAgent";
+
+    public static void main(String[] args) throws Throwable {
+        String agentJar =
+            ClassFileInstaller.writeJar("AnonVmClassesDuringDumpTransformer.jar",
+                                        ClassFileInstaller.Manifest.fromSourceFile("AnonVmClassesDuringDumpTransformer.mf"),
+                                        agentClasses);
+
+        String appJar =
+            ClassFileInstaller.writeJar("AnonVmClassesDuringDumpApp.jar", appClasses);
+
+        TestCommon.testDump(appJar, TestCommon.list("Hello"),
+                            "-javaagent:" + agentJar,
+                            "-XX:+UnlockDiagnosticVMOptions", cdsDiagnosticOption,
+                            // Set the following property to see logs for dynamically generated classes
+                            // in STDOUT
+                            "-Djava.lang.invoke.MethodHandle.DUMP_CLASS_FILES=true");
+
+        String prefix = ".class.load. ";
+        // class name pattern like the following:
+        // jdk.internal.loader.BuiltinClassLoader$$Lambda$1/1816757085
+        // java.lang.invoke.LambdaForm$MH/1585787493
+        String class_pattern = ".*Lambda([a-z0-9$]+)/([0-9]+).*";
+        String suffix = ".*source: shared objects file.*";
+        String pattern = prefix + class_pattern + suffix;
+        // during run time, anonymous classes shouldn't be loaded from the archive
+        TestCommon.run("-cp", appJar,
+            "-XX:+UnlockDiagnosticVMOptions", cdsDiagnosticOption, "Hello")
+            .assertNormalExit(output -> output.shouldNotMatch(pattern));
+
+        // inspect the archive and make sure no anonymous class is in there
+        TestCommon.run("-cp", appJar,
+            "-XX:+UnlockDiagnosticVMOptions", cdsDiagnosticOption,
+            "-XX:+PrintSharedArchiveAndExit", "-XX:+PrintSharedDictionary", "Hello")
+            .assertNormalExit(output -> output.shouldNotMatch(class_pattern));
+    }
+}
+