--- old/test/hotspot/jtreg/runtime/appcds/CommandLineFlagComboNegative.java	2019-07-24 08:26:24.961471241 -0400
+++ /dev/null	2019-07-22 09:37:15.068007775 -0400
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2014, 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 CommandLineFlagComboNegative
- * @summary Test command line flag combinations that differ between
- *          the dump and execute steps, in such way that they cause errors
- *          E.g. use compressed oops for creating and archive, but then
- *               execute w/o compressed oops
- * @requires vm.cds
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
- * @compile test-classes/Hello.java
- * @run driver CommandLineFlagComboNegative
- */
-
-import java.util.ArrayList;
-import jdk.test.lib.Platform;
-import jdk.test.lib.process.OutputAnalyzer;
-
-public class CommandLineFlagComboNegative {
-
-    private class TestVector {
-        public String testOptionForDumpStep;
-        public String testOptionForExecuteStep;
-        public String expectedErrorMsg;
-        public int expectedErrorCode;
-
-        public TestVector(String testOptionForDumpStep, String testOptionForExecuteStep,
-                          String expectedErrorMsg, int expectedErrorCode) {
-            this.testOptionForDumpStep=testOptionForDumpStep;
-            this.testOptionForExecuteStep=testOptionForExecuteStep;
-            this.expectedErrorMsg=expectedErrorMsg;
-            this.expectedErrorCode=expectedErrorCode;
-        }
-    }
-
-    private ArrayList<TestVector> testTable = new ArrayList<TestVector>();
-
-    private void initTestTable() {
-        // These options are not applicable on 32-bit platforms
-        if (Platform.is64bit()) {
-            testTable.add( new TestVector("-XX:ObjectAlignmentInBytes=8", "-XX:ObjectAlignmentInBytes=16",
-                "An error has occurred while processing the shared archive file", 1) );
-            if (!TestCommon.isDynamicArchive()) {
-                testTable.add( new TestVector("-XX:ObjectAlignmentInBytes=64", "-XX:ObjectAlignmentInBytes=32",
-                    "An error has occurred while processing the shared archive file", 1) );
-            }
-            testTable.add( new TestVector("-XX:+UseCompressedOops", "-XX:-UseCompressedOops",
-                "Class data sharing is inconsistent with other specified options", 1) );
-            testTable.add( new TestVector("-XX:+UseCompressedClassPointers", "-XX:-UseCompressedClassPointers",
-                "Class data sharing is inconsistent with other specified options", 1) );
-        }
-    }
-
-    private void runTests() throws Exception
-    {
-        for (TestVector testEntry : testTable) {
-            System.out.println("CommandLineFlagComboNegative: dump = " + testEntry.testOptionForDumpStep);
-            System.out.println("CommandLineFlagComboNegative: execute = " + testEntry.testOptionForExecuteStep);
-
-            String appJar = JarBuilder.getOrCreateHelloJar();
-            OutputAnalyzer dumpOutput = TestCommon.dump(
-               appJar, new String[] {"Hello"}, testEntry.testOptionForDumpStep);
-
-            TestCommon.checkDump(dumpOutput, "Loading classes to share");
-
-            OutputAnalyzer execOutput = TestCommon.exec(appJar, testEntry.testOptionForExecuteStep, "Hello");
-            execOutput.shouldContain(testEntry.expectedErrorMsg);
-            execOutput.shouldHaveExitValue(testEntry.expectedErrorCode);
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        CommandLineFlagComboNegative thisClass = new CommandLineFlagComboNegative();
-        thisClass.initTestTable();
-        thisClass.runTests();
-    }
-}
--- /dev/null	2019-07-22 09:37:15.068007775 -0400
+++ new/test/hotspot/jtreg/runtime/cds/CommandLineFlagComboNegative.java	2019-07-24 08:26:24.637471252 -0400
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2014, 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 CommandLineFlagComboNegative
+ * @summary Test command line flag combinations that differ between
+ *          the dump and execute steps, in such way that they cause errors
+ *          E.g. use compressed oops for creating and archive, but then
+ *               execute w/o compressed oops
+ * @requires vm.cds
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ *          jdk.jartool/sun.tools.jar
+ * @compile test-classes/Hello.java
+ * @run driver CommandLineFlagComboNegative
+ */
+
+import java.util.ArrayList;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class CommandLineFlagComboNegative {
+
+    private class TestVector {
+        public String testOptionForDumpStep;
+        public String testOptionForExecuteStep;
+        public String expectedErrorMsg;
+        public int expectedErrorCode;
+
+        public TestVector(String testOptionForDumpStep, String testOptionForExecuteStep,
+                          String expectedErrorMsg, int expectedErrorCode) {
+            this.testOptionForDumpStep=testOptionForDumpStep;
+            this.testOptionForExecuteStep=testOptionForExecuteStep;
+            this.expectedErrorMsg=expectedErrorMsg;
+            this.expectedErrorCode=expectedErrorCode;
+        }
+    }
+
+    private ArrayList<TestVector> testTable = new ArrayList<TestVector>();
+
+    private void initTestTable() {
+        // These options are not applicable on 32-bit platforms
+        if (Platform.is64bit()) {
+            testTable.add( new TestVector("-XX:ObjectAlignmentInBytes=8", "-XX:ObjectAlignmentInBytes=16",
+                "An error has occurred while processing the shared archive file", 1) );
+            if (!TestCommon.isDynamicArchive()) {
+                testTable.add( new TestVector("-XX:ObjectAlignmentInBytes=64", "-XX:ObjectAlignmentInBytes=32",
+                    "An error has occurred while processing the shared archive file", 1) );
+            }
+            testTable.add( new TestVector("-XX:+UseCompressedOops", "-XX:-UseCompressedOops",
+                "Class data sharing is inconsistent with other specified options", 1) );
+            testTable.add( new TestVector("-XX:+UseCompressedClassPointers", "-XX:-UseCompressedClassPointers",
+                "Class data sharing is inconsistent with other specified options", 1) );
+        }
+    }
+
+    private void runTests() throws Exception
+    {
+        for (TestVector testEntry : testTable) {
+            System.out.println("CommandLineFlagComboNegative: dump = " + testEntry.testOptionForDumpStep);
+            System.out.println("CommandLineFlagComboNegative: execute = " + testEntry.testOptionForExecuteStep);
+
+            String appJar = JarBuilder.getOrCreateHelloJar();
+            OutputAnalyzer dumpOutput = TestCommon.dump(
+               appJar, new String[] {"Hello"}, testEntry.testOptionForDumpStep);
+
+            TestCommon.checkDump(dumpOutput, "Loading classes to share");
+
+            OutputAnalyzer execOutput = TestCommon.exec(appJar, testEntry.testOptionForExecuteStep, "Hello");
+            execOutput.shouldContain(testEntry.expectedErrorMsg);
+            execOutput.shouldHaveExitValue(testEntry.expectedErrorCode);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        CommandLineFlagComboNegative thisClass = new CommandLineFlagComboNegative();
+        thisClass.initTestTable();
+        thisClass.runTests();
+    }
+}