*** old/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/MismatchedPatchModule.java	Fri Apr  6 15:40:36 2018
--- new/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/MismatchedPatchModule.java	Fri Apr  6 15:40:36 2018

*** 79,94 ****
--- 79,95 ----
                  TestCommon.list("javax/naming/spi/NamingManager"),
                  "PatchMain", "javax.naming.spi.NamingManager");
          TestCommon.checkDump(output, "Loading classes to share");
  
          // javax.naming.spi.NamingManager is patched at runtime
!         output = TestCommon.execCommon(
!         TestCommon.run(
              "-XX:+UnlockDiagnosticVMOptions",
              "--patch-module=java.naming=" + moduleJar,
              "--patch-module=java.naming2=" + moduleJar,
              "-Xlog:class+path=info",
-             "PatchMain", "javax.naming.spi.NamingManager");
          output.shouldHaveExitValue(0)
!               .shouldContain("CDS is disabled")
+             .assertSilentlyDisabledCDS(out -> {
!                 out.shouldHaveExitValue(0)
                     .shouldContain("I pass!");
+             });
      }
  }