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

*** 84,104 ****
--- 84,105 ----
              TestCommon.dump(appJar,
                  TestCommon.list("javax/naming/spi/NamingManager", "mypackage/Hello"),
                  "--patch-module=java.naming=" + moduleJar,
                  "-Xlog:class+load",
                  "PatchMain", "javax.naming.spi.NamingManager", "mypackage.Hello");
          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(
!         output = TestCommon.execCommon(
              "-XX:+UnlockDiagnosticVMOptions",
              "-cp", classPath,
              "--patch-module=java.naming=" + moduleJar,
              "-Xlog:class+load",
!             "PatchMain", "javax.naming.spi.NamingManager", "mypackage.Hello");
            .assertNormalExit(
              "I pass!",
              "Hello!",
!             "Hello source: shared objects file");
+         output.shouldHaveExitValue(0)
+               .shouldContain("CDS is disabled")
+               .shouldContain("I pass!")
!               .shouldContain("Hello!");
      }
  }