langtools/test/tools/javac/modules/ModulePathTest.java

*** 27,46 ****
   * @library /tools/lib
   * @modules
   *      jdk.compiler/com.sun.tools.javac.api
   *      jdk.compiler/com.sun.tools.javac.main
   *      jdk.jdeps/com.sun.tools.javap
!  *      jdk.jlink/jdk.tools.jmod
   * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask toolbox.ModuleBuilder
   *      ModuleTestBase
   * @run main ModulePathTest
   */
  
  import java.io.File;
  import java.io.IOException;
  import java.nio.file.Files;
  import java.nio.file.Path;
  
  import toolbox.JarTask;
  import toolbox.JavacTask;
  import toolbox.ModuleBuilder;
  import toolbox.Task;
--- 27,47 ----
   * @library /tools/lib
   * @modules
   *      jdk.compiler/com.sun.tools.javac.api
   *      jdk.compiler/com.sun.tools.javac.main
   *      jdk.jdeps/com.sun.tools.javap
!  *      jdk.jlink
   * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask toolbox.ModuleBuilder
   *      ModuleTestBase
   * @run main ModulePathTest
   */
  
  import java.io.File;
  import java.io.IOException;
  import java.nio.file.Files;
  import java.nio.file.Path;
+ import java.util.spi.ToolProvider;
  
  import toolbox.JarTask;
  import toolbox.JavacTask;
  import toolbox.ModuleBuilder;
  import toolbox.Task;
*** 418,425 ****
          String[] args = {
                  "create",
                  "--class-path", dir.toString(),
                  jmod.toString()
          };
!         jdk.tools.jmod.Main.run(args, System.out);
      }
  }
--- 419,429 ----
          String[] args = {
                  "create",
                  "--class-path", dir.toString(),
                  jmod.toString()
          };
!         ToolProvider jmodTool = ToolProvider.findFirst("jmod").orElseThrow(() ->
!                 new RuntimeException("jmod tool not found")
!         );
!         jmodTool.run(System.out, System.out, args);
      }
  }