--- old/test/hotspot/jtreg/runtime/appcds/dynamicArchive/UnusedCPDuringDump.java	2019-07-24 08:27:23.833469190 -0400
+++ /dev/null	2019-07-22 09:37:15.068007775 -0400
@@ -1,84 +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.
- *
- */
-
-/*
- * @test
- * @summary non-empty dir in -cp should be fine during dump time if only classes
- *          from the system modules are being loaded even though some are
- *          defined to the PlatformClassLoader and AppClassLoader.
- * @requires vm.cds
- * @library /test/lib /test/hotspot/jtreg/runtime/appcds
- * @modules jdk.jartool/sun.tools.jar
- * @compile ../test-classes/Hello.java
- * @run main/othervm -Dtest.cds.copy.child.stdout=false UnusedCPDuringDump
- */
-
-import java.io.File;
-
-public class UnusedCPDuringDump extends DynamicArchiveTestBase {
-
-    public static void main(String[] args) throws Exception {
-        runTest(UnusedCPDuringDump::testDefaultBase);
-    }
-
-    static void testDefaultBase() throws Exception {
-        String topArchiveName = getNewArchiveName("top");
-        doTest(topArchiveName);
-    }
-
-    private static void doTest(String topArchiveName) throws Exception {
-        File dir = new File(System.getProperty("user.dir"));
-        File emptydir = new File(dir, "emptydir");
-        emptydir.mkdir();
-        String appJar = JarBuilder.getOrCreateHelloJar();
-        String bootClassPath = "-Xbootclasspath/a:" + appJar;
-
-        // Dumping with a non-empty directory in the -cp.
-        // It should be fine because the app class won't be loaded from the
-        // -cp, it is being loaded from the bootclasspath.
-        dump(topArchiveName,
-             "-Xlog:cds",
-             "-Xlog:cds+dynamic=debug",
-             bootClassPath,
-             "-cp", dir.getPath(),
-             "Hello")
-            .assertNormalExit(output -> {
-                 output.shouldContain("Buffer-space to target-space delta")
-                        .shouldContain("Written dynamic archive 0x");
-                });
-
-        // Running with -cp different from dumping. It should be fine because
-        // the runtime classpath won't be checked against unused classpath
-        // during dump time.
-        run(topArchiveName,
-            "-Xlog:class+load",
-            "-Xlog:cds+dynamic=debug,cds=debug",
-             bootClassPath,
-            "-cp", appJar, "Hello")
-            .assertNormalExit(output -> {
-                    output.shouldContain("Hello World")
-                          .shouldHaveExitValue(0);
-                });
-  }
-}
--- /dev/null	2019-07-22 09:37:15.068007775 -0400
+++ new/test/hotspot/jtreg/runtime/cds/dynamicArchive/UnusedCPDuringDump.java	2019-07-24 08:27:23.525469201 -0400
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ *
+ */
+
+/*
+ * @test
+ * @summary non-empty dir in -cp should be fine during dump time if only classes
+ *          from the system modules are being loaded even though some are
+ *          defined to the PlatformClassLoader and AppClassLoader.
+ * @requires vm.cds
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds
+ * @modules jdk.jartool/sun.tools.jar
+ * @compile ../test-classes/Hello.java
+ * @run main/othervm -Dtest.cds.copy.child.stdout=false UnusedCPDuringDump
+ */
+
+import java.io.File;
+
+public class UnusedCPDuringDump extends DynamicArchiveTestBase {
+
+    public static void main(String[] args) throws Exception {
+        runTest(UnusedCPDuringDump::testDefaultBase);
+    }
+
+    static void testDefaultBase() throws Exception {
+        String topArchiveName = getNewArchiveName("top");
+        doTest(topArchiveName);
+    }
+
+    private static void doTest(String topArchiveName) throws Exception {
+        File dir = new File(System.getProperty("user.dir"));
+        File emptydir = new File(dir, "emptydir");
+        emptydir.mkdir();
+        String appJar = JarBuilder.getOrCreateHelloJar();
+        String bootClassPath = "-Xbootclasspath/a:" + appJar;
+
+        // Dumping with a non-empty directory in the -cp.
+        // It should be fine because the app class won't be loaded from the
+        // -cp, it is being loaded from the bootclasspath.
+        dump(topArchiveName,
+             "-Xlog:cds",
+             "-Xlog:cds+dynamic=debug",
+             bootClassPath,
+             "-cp", dir.getPath(),
+             "Hello")
+            .assertNormalExit(output -> {
+                 output.shouldContain("Buffer-space to target-space delta")
+                        .shouldContain("Written dynamic archive 0x");
+                });
+
+        // Running with -cp different from dumping. It should be fine because
+        // the runtime classpath won't be checked against unused classpath
+        // during dump time.
+        run(topArchiveName,
+            "-Xlog:class+load",
+            "-Xlog:cds+dynamic=debug,cds=debug",
+             bootClassPath,
+            "-cp", appJar, "Hello")
+            .assertNormalExit(output -> {
+                    output.shouldContain("Hello World")
+                          .shouldHaveExitValue(0);
+                });
+  }
+}