*** old/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java	Fri Apr  6 15:48:23 2018
--- new/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java	Fri Apr  6 15:48:23 2018

*** 86,105 ****
--- 86,108 ----
              TestCommon.dump(appJar,
                  TestCommon.list("javax/naming/Reference", "mypackage/MyReference"),
                  "--patch-module=java.naming=" + moduleJar,
                  "-Xlog:class+load",
                  "PatchMain", "javax.naming.Reference", "mypackage.MyReference");
          TestCommon.checkDump(output, "Loading classes to share");
+         output.shouldHaveExitValue(1)
+               .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
  
          String classPath = appJar + File.pathSeparator + classDir;
          System.out.println("classPath: " + classPath);
          TestCommon.run(
              "-XX:+UnlockDiagnosticVMOptions",
              "-cp", classPath,
              "--patch-module=java.naming=" + moduleJar,
              "-Xlog:class+load",
              "PatchMain", "javax.naming.Reference", "mypackage.MyReference")
            .assertNormalExit(
              "I pass!",
              "MyReference source: file:");
+             .assertSilentlyDisabledCDS(out -> {
+                 out.shouldHaveExitValue(0)
+                    .shouldContain("MyReference source: file:")
+                    .shouldContain("I pass!");
+             });
      }
  }