--- old/test/hotspot/jtreg/runtime/appcds/CDSandJFR.java	2019-07-24 08:26:21.109471375 -0400
+++ /dev/null	2019-07-22 09:37:15.068007775 -0400
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2018, 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 Make sure CDS and JFR work together.
- * @requires vm.hasJFR & vm.cds
- * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes test-classes
- * @modules jdk.jfr
- * @build Hello GetFlightRecorder
- * @run driver ClassFileInstaller -jar CDSandJFR.jar Hello GetFlightRecorder GetFlightRecorder$TestEvent GetFlightRecorder$SimpleEvent
- * @run main/othervm/timeout=500 CDSandJFR
- */
-
-import jdk.test.lib.BuildHelper;
-import jdk.test.lib.process.OutputAnalyzer;
-
-public class CDSandJFR {
-    static String[] classes = {
-        "jdk/jfr/Event",
-        "jdk/jfr/events/FileReadEvent",
-        "jdk/jfr/events/FileWriteEvent",
-        "jdk/jfr/events/SocketReadEvent",
-        "jdk/jfr/events/SocketWriteEvent",
-        "jdk/jfr/events/ExceptionThrownEvent",
-        "jdk/jfr/events/ExceptionStatisticsEvent",
-        "jdk/jfr/events/ErrorThrownEvent",
-        "jdk/jfr/events/ActiveSettingEvent",
-        "jdk/jfr/events/ActiveRecordingEvent",
-        "Hello",
-        "GetFlightRecorder",
-        "GetFlightRecorder$TestEvent",
-    };
-
-    public static void main(String[] args) throws Exception {
-        test(classes);
-    }
-
-    static void test(String[] classes) throws Exception {
-        String appJar = ClassFileInstaller.getJarPath("CDSandJFR.jar");
-        OutputAnalyzer output;
-        output = TestCommon.testDump(appJar, TestCommon.list(classes));
-        TestCommon.checkDump(output, "Skipping jdk/jfr/Event: JFR event class");
-
-        output = TestCommon.exec(appJar,
-                                 "-XX:StartFlightRecording=dumponexit=true",
-                                 "Hello");
-        TestCommon.checkExec(output, "Hello World");
-
-        TestCommon.checkExec(TestCommon.exec(appJar,
-                                             "-XX:FlightRecorderOptions=retransform=true",
-                                             "GetFlightRecorder"));
-        TestCommon.checkExec(TestCommon.exec(appJar,
-                                             "-XX:FlightRecorderOptions=retransform=false",
-                                             "GetFlightRecorder"));
-
-        // Test dumping with flight recorder enabled.
-        output = TestCommon.testDump(appJar, TestCommon.list(classes),
-                                     "-XX:StartFlightRecording=dumponexit=true");
-        TestCommon.checkDump(output, "warning: JFR will be disabled during CDS dumping");
-    }
-}
--- /dev/null	2019-07-22 09:37:15.068007775 -0400
+++ new/test/hotspot/jtreg/runtime/cds/CDSandJFR.java	2019-07-24 08:26:20.781471387 -0400
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2018, 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 Make sure CDS and JFR work together.
+ * @requires vm.hasJFR & vm.cds
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds /test/hotspot/jtreg/runtime/cds/test-classes test-classes
+ * @modules jdk.jfr
+ * @build Hello GetFlightRecorder
+ * @run driver ClassFileInstaller -jar CDSandJFR.jar Hello GetFlightRecorder GetFlightRecorder$TestEvent GetFlightRecorder$SimpleEvent
+ * @run main/othervm/timeout=500 CDSandJFR
+ */
+
+import jdk.test.lib.BuildHelper;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class CDSandJFR {
+    static String[] classes = {
+        "jdk/jfr/Event",
+        "jdk/jfr/events/FileReadEvent",
+        "jdk/jfr/events/FileWriteEvent",
+        "jdk/jfr/events/SocketReadEvent",
+        "jdk/jfr/events/SocketWriteEvent",
+        "jdk/jfr/events/ExceptionThrownEvent",
+        "jdk/jfr/events/ExceptionStatisticsEvent",
+        "jdk/jfr/events/ErrorThrownEvent",
+        "jdk/jfr/events/ActiveSettingEvent",
+        "jdk/jfr/events/ActiveRecordingEvent",
+        "Hello",
+        "GetFlightRecorder",
+        "GetFlightRecorder$TestEvent",
+    };
+
+    public static void main(String[] args) throws Exception {
+        test(classes);
+    }
+
+    static void test(String[] classes) throws Exception {
+        String appJar = ClassFileInstaller.getJarPath("CDSandJFR.jar");
+        OutputAnalyzer output;
+        output = TestCommon.testDump(appJar, TestCommon.list(classes));
+        TestCommon.checkDump(output, "Skipping jdk/jfr/Event: JFR event class");
+
+        output = TestCommon.exec(appJar,
+                                 "-XX:StartFlightRecording=dumponexit=true",
+                                 "Hello");
+        TestCommon.checkExec(output, "Hello World");
+
+        TestCommon.checkExec(TestCommon.exec(appJar,
+                                             "-XX:FlightRecorderOptions=retransform=true",
+                                             "GetFlightRecorder"));
+        TestCommon.checkExec(TestCommon.exec(appJar,
+                                             "-XX:FlightRecorderOptions=retransform=false",
+                                             "GetFlightRecorder"));
+
+        // Test dumping with flight recorder enabled.
+        output = TestCommon.testDump(appJar, TestCommon.list(classes),
+                                     "-XX:StartFlightRecording=dumponexit=true");
+        TestCommon.checkDump(output, "warning: JFR will be disabled during CDS dumping");
+    }
+}