test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java

*** 89,105 ****
          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);
!         output = TestCommon.execCommon(
              "-XX:+UnlockDiagnosticVMOptions",
              "-cp", classPath,
              "--patch-module=java.naming=" + moduleJar,
              "-Xlog:class+load",
!             "PatchMain", "javax.naming.spi.NamingManager", "mypackage.Hello");
!         output.shouldHaveExitValue(0)
                .shouldContain("CDS is disabled")
                .shouldContain("I pass!")
                .shouldContain("Hello!");
      }
  }
--- 89,107 ----
          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.spi.NamingManager", "mypackage.Hello")
!             .assertSilentlyDisabledCDS(out -> {
!                 out.shouldHaveExitValue(0)
                     .shouldContain("CDS is disabled")
                     .shouldContain("I pass!")
                     .shouldContain("Hello!");
+             });
      }
  }