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

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2016, 2018, 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.

*** 66,81 ****
--- 66,85 ----
                  TestCommon.list("javax/naming/spi/NamingManager"),
                  "--patch-module=java.naming=" + 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(
              "-XX:+UnlockDiagnosticVMOptions",
              "--patch-module=java.naming=" + moduleJar,
              "-Xlog:class+load",
              "-Xlog:class+path=info",
              "PatchMain", "javax.naming.spi.NamingManager")
            .assertNormalExit("I pass!");
+             .assertSilentlyDisabledCDS(out -> {
+                 out.shouldHaveExitValue(0)
+                    .shouldContain("I pass!");
+             });
      }
  }