--- old/test/hotspot/jtreg/runtime/appcds/customLoader/ClassListFormatB.java	2019-07-24 08:27:01.993469951 -0400
+++ /dev/null	2019-07-22 09:37:15.068007775 -0400
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2015, 2019, 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 Tests the format checking of hotspot/src/closed/share/vm/classfile/classListParser.cpp.
- *
- * @requires vm.cds
- * @requires vm.cds.custom.loaders
- * @library /test/lib /test/hotspot/jtreg/runtime/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
- * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
- *          test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
- * @run driver ClassListFormatB
- */
-
-public class ClassListFormatB extends ClassListFormatBase {
-    static {
-        // Uncomment the following line to run only one of the test cases
-        // ClassListFormatBase.RUN_ONLY_TEST = "TESTCASE B1";
-    }
-
-    public static void main(String[] args) throws Throwable {
-        String appJar = JarBuilder.getOrCreateHelloJar();
-        String customJarPath = JarBuilder.build("ClassListFormatB", "CustomLoadee",
-                                            "CustomLoadee2", "CustomInterface2_ia", "CustomInterface2_ib");
-        //----------------------------------------------------------------------
-        // TESTGROUP B if source IS specified
-        //----------------------------------------------------------------------
-        dumpShouldFail(
-            "TESTCASE B1: if source: is specified, must specify super:",
-            appJar, classlist(
-                "Hello",
-                "java/lang/Object id: 1",
-                "CustomLoadee id: 2 source: " + customJarPath
-            ),
-            "If source location is specified, super class must be also specified");
-
-        dumpShouldFail(
-            "TESTCASE B2: if source: is specified, must specify id:",
-            appJar, classlist(
-                "Hello",
-                "java/lang/Object id: 1",
-                "CustomLoadee super: 1 source: " + customJarPath
-            ),
-            "If source location is specified, id must be also specified");
-    }
-}
--- /dev/null	2019-07-22 09:37:15.068007775 -0400
+++ new/test/hotspot/jtreg/runtime/cds/customLoader/ClassListFormatB.java	2019-07-24 08:27:01.709469961 -0400
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015, 2019, 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 Tests the format checking of hotspot/src/closed/share/vm/classfile/classListParser.cpp.
+ *
+ * @requires vm.cds
+ * @requires vm.cds.custom.loaders
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ *          jdk.jartool/sun.tools.jar
+ * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
+ *          test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
+ * @run driver ClassListFormatB
+ */
+
+public class ClassListFormatB extends ClassListFormatBase {
+    static {
+        // Uncomment the following line to run only one of the test cases
+        // ClassListFormatBase.RUN_ONLY_TEST = "TESTCASE B1";
+    }
+
+    public static void main(String[] args) throws Throwable {
+        String appJar = JarBuilder.getOrCreateHelloJar();
+        String customJarPath = JarBuilder.build("ClassListFormatB", "CustomLoadee",
+                                            "CustomLoadee2", "CustomInterface2_ia", "CustomInterface2_ib");
+        //----------------------------------------------------------------------
+        // TESTGROUP B if source IS specified
+        //----------------------------------------------------------------------
+        dumpShouldFail(
+            "TESTCASE B1: if source: is specified, must specify super:",
+            appJar, classlist(
+                "Hello",
+                "java/lang/Object id: 1",
+                "CustomLoadee id: 2 source: " + customJarPath
+            ),
+            "If source location is specified, super class must be also specified");
+
+        dumpShouldFail(
+            "TESTCASE B2: if source: is specified, must specify id:",
+            appJar, classlist(
+                "Hello",
+                "java/lang/Object id: 1",
+                "CustomLoadee super: 1 source: " + customJarPath
+            ),
+            "If source location is specified, id must be also specified");
+    }
+}