*** old/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java	Mon Apr  2 14:11:58 2018
--- new/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java	Mon Apr  2 14:11:58 2018

*** 85,100 ****
--- 85,103 ----
                  TestCommon.list("javax/naming/spi/NamingManager"),
                  "--patch-module=java.naming=" + moduleJar2 + File.pathSeparator + moduleJar,
                  "-Xlog:class+load",
                  "-Xlog:class+path=info",
                  "PatchMain", "javax.naming.spi.NamingManager");
          TestCommon.checkDump(output, "Loading classes to share");
+         output.shouldHaveExitValue(1)
+               .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
  
!         TestCommon.run(
!         output = TestCommon.execCommon(
              "-XX:+UnlockDiagnosticVMOptions",
              "--patch-module=java.naming=" + moduleJar2 + File.pathSeparator + moduleJar,
              "-Xlog:class+load",
              "-Xlog:class+path=info",
!             "PatchMain", "javax.naming.spi.NamingManager");
            .assertNormalExit("I pass");
+         output.shouldHaveExitValue(0)
+               .shouldContain("CDS is disabled")
+               .shouldContain("I pass!");
      }
  }