--- old/test/hotspot/jtreg/runtime/appcds/jvmti/ClassFileLoadHookTest.java	2019-07-24 08:27:48.925468316 -0400
+++ /dev/null	2019-07-22 09:37:15.068007775 -0400
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2016, 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 Test jvmti class file loader hook interaction with AppCDS
- * @library /test/lib /test/hotspot/jtreg/runtime/appcds
- * @requires vm.cds
- * @build ClassFileLoadHook
- * @run main/othervm/native ClassFileLoadHookTest
- */
-
-
-import jdk.test.lib.cds.CDSOptions;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-
-
-public class ClassFileLoadHookTest {
-    public static String sharedClasses[] = {
-        "ClassFileLoadHook",
-        "ClassFileLoadHook$TestCaseId",
-        "ClassFileLoadHook$1",
-        "LoadMe",
-        "java/sql/SQLException"
-    };
-
-    public static void main(String[] args) throws Exception {
-        String wbJar =
-            ClassFileInstaller.writeJar("WhiteBox.jar", "sun.hotspot.WhiteBox");
-        String appJar =
-            ClassFileInstaller.writeJar("ClassFileLoadHook.jar", sharedClasses);
-        String useWb = "-Xbootclasspath/a:" + wbJar;
-
-        // First, run the test class directly, w/o sharing, as a baseline reference
-        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-                "-XX:+UnlockDiagnosticVMOptions",
-                "-XX:+WhiteBoxAPI",
-                useWb,
-                "-agentlib:SimpleClassFileLoadHook=LoadMe,beforeHook,after_Hook",
-                "ClassFileLoadHook",
-                "" + ClassFileLoadHook.TestCaseId.SHARING_OFF_CFLH_ON);
-        TestCommon.executeAndLog(pb, "no-sharing").shouldHaveExitValue(0);
-
-        // Run with AppCDS, but w/o CFLH - second baseline
-        TestCommon.testDump(appJar, sharedClasses, useWb);
-        OutputAnalyzer out = TestCommon.exec(appJar,
-                "-XX:+UnlockDiagnosticVMOptions",
-                "-XX:+WhiteBoxAPI", useWb,
-                "ClassFileLoadHook",
-                "" + ClassFileLoadHook.TestCaseId.SHARING_ON_CFLH_OFF);
-
-        TestCommon.checkExec(out);
-
-
-        // Now, run with AppCDS with -Xshare:auto and CFLH
-        out = TestCommon.execAuto("-cp", appJar,
-                "-XX:+UnlockDiagnosticVMOptions",
-                "-XX:+WhiteBoxAPI", useWb,
-                "-agentlib:SimpleClassFileLoadHook=LoadMe,beforeHook,after_Hook",
-                "ClassFileLoadHook",
-                "" + ClassFileLoadHook.TestCaseId.SHARING_AUTO_CFLH_ON);
-
-        CDSOptions opts = (new CDSOptions()).setXShareMode("auto");
-        TestCommon.checkExec(out, opts);
-
-        // Now, run with AppCDS -Xshare:on and CFLH
-        out = TestCommon.exec(appJar,
-                "-XX:+UnlockDiagnosticVMOptions",
-                "-XX:+WhiteBoxAPI", useWb,
-                "-agentlib:SimpleClassFileLoadHook=LoadMe,beforeHook,after_Hook",
-                "ClassFileLoadHook",
-                "" + ClassFileLoadHook.TestCaseId.SHARING_ON_CFLH_ON);
-        TestCommon.checkExec(out);
-    }
-}
--- /dev/null	2019-07-22 09:37:15.068007775 -0400
+++ new/test/hotspot/jtreg/runtime/cds/jvmti/ClassFileLoadHookTest.java	2019-07-24 08:27:48.645468326 -0400
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2016, 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 Test jvmti class file loader hook interaction with AppCDS
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds
+ * @requires vm.cds
+ * @build ClassFileLoadHook
+ * @run main/othervm/native ClassFileLoadHookTest
+ */
+
+
+import jdk.test.lib.cds.CDSOptions;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+
+public class ClassFileLoadHookTest {
+    public static String sharedClasses[] = {
+        "ClassFileLoadHook",
+        "ClassFileLoadHook$TestCaseId",
+        "ClassFileLoadHook$1",
+        "LoadMe",
+        "java/sql/SQLException"
+    };
+
+    public static void main(String[] args) throws Exception {
+        String wbJar =
+            ClassFileInstaller.writeJar("WhiteBox.jar", "sun.hotspot.WhiteBox");
+        String appJar =
+            ClassFileInstaller.writeJar("ClassFileLoadHook.jar", sharedClasses);
+        String useWb = "-Xbootclasspath/a:" + wbJar;
+
+        // First, run the test class directly, w/o sharing, as a baseline reference
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-XX:+WhiteBoxAPI",
+                useWb,
+                "-agentlib:SimpleClassFileLoadHook=LoadMe,beforeHook,after_Hook",
+                "ClassFileLoadHook",
+                "" + ClassFileLoadHook.TestCaseId.SHARING_OFF_CFLH_ON);
+        TestCommon.executeAndLog(pb, "no-sharing").shouldHaveExitValue(0);
+
+        // Run with AppCDS, but w/o CFLH - second baseline
+        TestCommon.testDump(appJar, sharedClasses, useWb);
+        OutputAnalyzer out = TestCommon.exec(appJar,
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-XX:+WhiteBoxAPI", useWb,
+                "ClassFileLoadHook",
+                "" + ClassFileLoadHook.TestCaseId.SHARING_ON_CFLH_OFF);
+
+        TestCommon.checkExec(out);
+
+
+        // Now, run with AppCDS with -Xshare:auto and CFLH
+        out = TestCommon.execAuto("-cp", appJar,
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-XX:+WhiteBoxAPI", useWb,
+                "-agentlib:SimpleClassFileLoadHook=LoadMe,beforeHook,after_Hook",
+                "ClassFileLoadHook",
+                "" + ClassFileLoadHook.TestCaseId.SHARING_AUTO_CFLH_ON);
+
+        CDSOptions opts = (new CDSOptions()).setXShareMode("auto");
+        TestCommon.checkExec(out, opts);
+
+        // Now, run with AppCDS -Xshare:on and CFLH
+        out = TestCommon.exec(appJar,
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-XX:+WhiteBoxAPI", useWb,
+                "-agentlib:SimpleClassFileLoadHook=LoadMe,beforeHook,after_Hook",
+                "ClassFileLoadHook",
+                "" + ClassFileLoadHook.TestCaseId.SHARING_ON_CFLH_ON);
+        TestCommon.checkExec(out);
+    }
+}