--- /dev/null	2019-02-25 13:26:02.045529497 -0800
+++ new/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java	2019-08-23 16:50:27.090772464 -0700
@@ -0,0 +1,115 @@
+/*
+ * 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 Handling of non-existent classpath elements during dump time and run time
+ * @requires vm.cds
+ * @library /test/lib
+ * @modules jdk.jartool/sun.tools.jar
+ * @compile test-classes/Hello.java
+ * @compile test-classes/HelloMore.java
+ * @run driver NonExistClasspath
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class NonExistClasspath {
+    public static void main(String[] args) throws Exception {
+        String appJar = JarBuilder.getOrCreateHelloJar();
+        doTest(appJar, false);
+        doTest(appJar, true);
+    }
+
+    static void doTest(String appJar, boolean bootcp) throws Exception {
+        String classDir = System.getProperty("test.classes");
+        String newFile = "non-exist.jar";
+        String nonExistPath = classDir + File.separator + newFile;
+        final String errorMessage1 = "Unable to use shared archive";
+        final String errorMessage2 = "shared class paths mismatch";
+        final String errorMessage3 = (bootcp ? "BOOT" : "APP") + " classpath mismatch";
+
+        (new File(nonExistPath)).delete();
+
+        String classPath = nonExistPath + File.pathSeparator + appJar;
+        TestCommon.testDump("foobar", TestCommon.list("Hello"), make_args(bootcp, classPath));
+
+        // The nonExistPath doesn't exist yet, so we should be able to run without problem
+        TestCommon.run(make_args(bootcp,
+                                 classPath, 
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertNormalExit();
+
+        // Replace nonExistPath with another non-existent file in the CP, it should still work
+        TestCommon.run(make_args(bootcp,
+                                 nonExistPath + ".duh"  + File.pathSeparator + appJar,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertNormalExit();
+
+        // Add a few more non-existent files in the CP, it should still work
+        TestCommon.run(make_args(bootcp,
+                                 nonExistPath + ".duh"  + File.pathSeparator +
+                                 nonExistPath + ".daa"  + File.pathSeparator +
+                                 nonExistPath + ".boo"  + File.pathSeparator +
+                                 appJar,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertNormalExit();
+
+        // Or, remove all non-existent paths from the CP, it should still work
+        TestCommon.run(make_args(bootcp,
+                                 appJar,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertNormalExit();
+
+        // Now make nonExistPath exist. CDS will fail to load.
+        Files.copy(Paths.get(classDir, "hello.jar"),
+                   Paths.get(classDir, newFile),
+                   StandardCopyOption.REPLACE_EXISTING);
+
+        TestCommon.run(make_args(bootcp,
+                                 classPath,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertAbnormalExit(errorMessage1, errorMessage2, errorMessage3);
+    }
+
+    static String[] make_args(boolean bootcp, String cp, String... suffix) {
+        String args[];
+        if (bootcp) {
+            args = TestCommon.concat("-Xbootclasspath/a:" + cp);
+        } else {
+            args = TestCommon.concat("-cp", cp);
+        }
+
+        return TestCommon.concat(args, suffix);
+    }
+}