test/runtime/modules/PatchModule/PatchModule2Dirs.java

*** 21,41 ****
   * questions.
   */
  
  /*
   * @test
!  * @summary Make sure -Xpatch works with multiple directories.
   * @modules java.base/jdk.internal.misc
   * @library /testlibrary
!  * @compile Xpatch2DirsMain.java
!  * @run main Xpatch2Dirs
   */
  
  import jdk.test.lib.*;
  import java.io.File;
  
! public class Xpatch2Dirs {
  
      public static void main(String[] args) throws Exception {
          String source1 = "package javax.naming.spi; "               +
                          "public class NamingManager { "             +
                          "    static { "                             +
--- 21,41 ----
   * questions.
   */
  
  /*
   * @test
!  * @summary Make sure --patch-module works with multiple directories.
   * @modules java.base/jdk.internal.misc
   * @library /testlibrary
!  * @compile PatchModule2DirsMain.java
!  * @run main PatchModule2Dirs
   */
  
  import jdk.test.lib.*;
  import java.io.File;
  
! public class PatchModule2Dirs {
  
      public static void main(String[] args) throws Exception {
          String source1 = "package javax.naming.spi; "               +
                          "public class NamingManager { "             +
                          "    static { "                             +
*** 56,68 ****
          ClassFileInstaller.writeClassToDisk("java/beans/Encoder",
               InMemoryJavaCompiler.compile("java.beans.Encoder", source2, "-Xmodule:java.desktop"),
               "mods2/java.desktop");
  
          ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
!              "-Xpatch:java.naming=mods/java.naming",
!              "-Xpatch:java.desktop=mods2/java.desktop",
!              "Xpatch2DirsMain", "javax.naming.spi.NamingManager", "java.beans.Encoder");
  
          OutputAnalyzer oa = new OutputAnalyzer(pb.start());
          oa.shouldContain("I pass one!");
          oa.shouldContain("I pass two!");
          oa.shouldHaveExitValue(0);
--- 56,68 ----
          ClassFileInstaller.writeClassToDisk("java/beans/Encoder",
               InMemoryJavaCompiler.compile("java.beans.Encoder", source2, "-Xmodule:java.desktop"),
               "mods2/java.desktop");
  
          ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
!              "--patch-module=java.naming=mods/java.naming",
!              "--patch-module=java.desktop=mods2/java.desktop",
!              "PatchModule2DirsMain", "javax.naming.spi.NamingManager", "java.beans.Encoder");
  
          OutputAnalyzer oa = new OutputAnalyzer(pb.start());
          oa.shouldContain("I pass one!");
          oa.shouldContain("I pass two!");
          oa.shouldHaveExitValue(0);