--- old/test/hotspot/jtreg/runtime/appcds/dynamicArchive/WrongTopClasspath.java	2019-07-24 08:27:24.169469179 -0400
+++ /dev/null	2019-07-22 09:37:15.068007775 -0400
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 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.
- *
- */
-
-import java.io.File;
-
-/*
- * @test
- * @summary correct classpath for bottom archive, but bad classpath for top archive
- * @requires vm.cds
- * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes
- * @build GenericTestApp sun.hotspot.WhiteBox
- * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
- * @run driver ClassFileInstaller -jar GenericTestApp.jar GenericTestApp
- * @run driver ClassFileInstaller -jar WrongJar.jar GenericTestApp
- * @run driver WrongTopClasspath
- */
-
-public class WrongTopClasspath extends DynamicArchiveTestBase {
-
-    public static void main(String[] args) throws Exception {
-        runTest(WrongTopClasspath::test);
-    }
-
-    static void test(String args[]) throws Exception {
-        String topArchiveName = getNewArchiveName("top");
-        String baseArchiveName = getNewArchiveName("base");
-        dumpBaseArchive(baseArchiveName);
-
-        String appJar    = ClassFileInstaller.getJarPath("GenericTestApp.jar");
-        String wrongJar  = ClassFileInstaller.getJarPath("WrongJar.jar");
-        String mainClass = "GenericTestApp";
-
-        // Dump the top archive using "-cp GenericTestApp.jar" ...
-        dump2_WB(baseArchiveName, topArchiveName,
-                 "-Xlog:cds*",
-                 "-Xlog:cds+dynamic=debug",
-                 "-cp", appJar, mainClass)
-            .assertNormalExit();
-
-        // ... but try to load the top archive using "-cp WrongJar.jar".
-        // Use -Xshare:auto so top archive can fail after base archive has succeeded,
-        // but the app will continue to run.
-        run2_WB(baseArchiveName, topArchiveName,
-                "-Xlog:cds*",
-                "-Xlog:cds+dynamic=debug",
-                "-Xlog:class+path=info",
-                "-Xshare:auto",
-                "-cp", wrongJar, mainClass,
-                "assertShared:java.lang.Object",  // base archive still useable
-                "assertNotShared:GenericTestApp") // but top archive is not useable
-          .assertNormalExit("The top archive failed to load");
-    }
-}
--- /dev/null	2019-07-22 09:37:15.068007775 -0400
+++ new/test/hotspot/jtreg/runtime/cds/dynamicArchive/WrongTopClasspath.java	2019-07-24 08:27:23.901469188 -0400
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 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.
+ *
+ */
+
+import java.io.File;
+
+/*
+ * @test
+ * @summary correct classpath for bottom archive, but bad classpath for top archive
+ * @requires vm.cds
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds /test/hotspot/jtreg/runtime/cds/test-classes
+ * @build GenericTestApp sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller -jar GenericTestApp.jar GenericTestApp
+ * @run driver ClassFileInstaller -jar WrongJar.jar GenericTestApp
+ * @run driver WrongTopClasspath
+ */
+
+public class WrongTopClasspath extends DynamicArchiveTestBase {
+
+    public static void main(String[] args) throws Exception {
+        runTest(WrongTopClasspath::test);
+    }
+
+    static void test(String args[]) throws Exception {
+        String topArchiveName = getNewArchiveName("top");
+        String baseArchiveName = getNewArchiveName("base");
+        dumpBaseArchive(baseArchiveName);
+
+        String appJar    = ClassFileInstaller.getJarPath("GenericTestApp.jar");
+        String wrongJar  = ClassFileInstaller.getJarPath("WrongJar.jar");
+        String mainClass = "GenericTestApp";
+
+        // Dump the top archive using "-cp GenericTestApp.jar" ...
+        dump2_WB(baseArchiveName, topArchiveName,
+                 "-Xlog:cds*",
+                 "-Xlog:cds+dynamic=debug",
+                 "-cp", appJar, mainClass)
+            .assertNormalExit();
+
+        // ... but try to load the top archive using "-cp WrongJar.jar".
+        // Use -Xshare:auto so top archive can fail after base archive has succeeded,
+        // but the app will continue to run.
+        run2_WB(baseArchiveName, topArchiveName,
+                "-Xlog:cds*",
+                "-Xlog:cds+dynamic=debug",
+                "-Xlog:class+path=info",
+                "-Xshare:auto",
+                "-cp", wrongJar, mainClass,
+                "assertShared:java.lang.Object",  // base archive still useable
+                "assertNotShared:GenericTestApp") // but top archive is not useable
+          .assertNormalExit("The top archive failed to load");
+    }
+}