test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java

rev 16468 : [mq]: xmodule-to-patch-module

*** 71,83 ****
                                               MODS_DIR,
                                               "--module-source-path", src.toString()));
          }
  
          // compile patched source
          assertTrue(CompilerUtils.compile(PATCH_SRC_DIR.resolve(JAVA_BASE),
                                           PATCH_DIR.resolve(JAVA_BASE),
!                                          "-Xmodule:java.base"));
          assertTrue(CompilerUtils.compile(PATCH_SRC_DIR.resolve("m2"),
                                           PATCH_DIR.resolve("m2")));
  
          // create an image with only m1 and m2
          if (Files.exists(JMODS)) {
--- 71,84 ----
                                               MODS_DIR,
                                               "--module-source-path", src.toString()));
          }
  
          // compile patched source
+         String patchDir = PATCH_SRC_DIR.resolve(JAVA_BASE).toString();
          assertTrue(CompilerUtils.compile(PATCH_SRC_DIR.resolve(JAVA_BASE),
                                           PATCH_DIR.resolve(JAVA_BASE),
!                                          "--patch-module", "java.base=" + patchDir));
          assertTrue(CompilerUtils.compile(PATCH_SRC_DIR.resolve("m2"),
                                           PATCH_DIR.resolve("m2")));
  
          // create an image with only m1 and m2
          if (Files.exists(JMODS)) {