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

*** 110,120 ****
          tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element, p.Other { }");
          Path classes = base.resolve("classes");
          tb.createDirectories(classes);
  
          String log = new JavacTask(tb)
!                 .options("-Xmodule:java.compiler", "-classpath", cpClasses.toString())
                  .outdir(classes)
                  .files(src.resolve("javax/lang/model/element/Extra.java"))
                  .run()
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 110,120 ----
          tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element, p.Other { }");
          Path classes = base.resolve("classes");
          tb.createDirectories(classes);
  
          String log = new JavacTask(tb)
!                 .options("-Xmodule:java.compiler", "--class-path", cpClasses.toString())
                  .outdir(classes)
                  .files(src.resolve("javax/lang/model/element/Extra.java"))
                  .run()
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 195,205 ****
          tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element { }");
          Path classes = base.resolve("classes");
          tb.createDirectories(classes);
  
          List<String> log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-Xmodule:java.compiler", "-modulesourcepath", src.toString())
                  .outdir(classes)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
--- 195,205 ----
          tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element { }");
          Path classes = base.resolve("classes");
          tb.createDirectories(classes);
  
          List<String> log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-Xmodule:java.compiler", "--module-source-path", src.toString())
                  .outdir(classes)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
*** 227,237 ****
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
  
          List<String> expected = Arrays.asList("javac: option -Xmodule: can only be specified once",
                                                "Usage: javac <options> <source files>",
!                                               "use -help for a list of possible options");
  
          if (!expected.equals(log))
              throw new Exception("expected output not found: " + log);
      }
  
--- 227,237 ----
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
  
          List<String> expected = Arrays.asList("javac: option -Xmodule: can only be specified once",
                                                "Usage: javac <options> <source files>",
!                                               "use --help for a list of possible options");
  
          if (!expected.equals(log))
              throw new Exception("expected output not found: " + log);
      }
  
*** 245,255 ****
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src, "package p; interface A extends pkg1.E { }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
!                 .options("-modulepath", modules.toString(),
                          "-Xmodule:m1")
                  .files(findJavaFiles(src))
                  .run()
                  .writeAll();
  
--- 245,255 ----
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src, "package p; interface A extends pkg1.E { }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
!                 .options("--module-path", modules.toString(),
                          "-Xmodule:m1")
                  .files(findJavaFiles(src))
                  .run()
                  .writeAll();
  
*** 261,271 ****
          Path src2 = base.resolve("src2");
          tb.writeJavaFiles(src2, "package p; interface A extends pkg2.D { }");
  
          List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
!                         "-modulepath", modules.toString(),
                          "-Xmodule:m1")
                  .files(findJavaFiles(src2))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
--- 261,271 ----
          Path src2 = base.resolve("src2");
          tb.writeJavaFiles(src2, "package p; interface A extends pkg2.D { }");
  
          List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
!                         "--module-path", modules.toString(),
                          "-Xmodule:m1")
                  .files(findJavaFiles(src2))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
*** 293,304 ****
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src, "package p; interface A extends pkg1.D { }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
!                 .options("-modulepath", modules.toString(),
!                         "-upgrademodulepath", upgrade.toString(),
                          "-Xmodule:m1")
                  .files(findJavaFiles(src))
                  .run()
                  .writeAll();
      }
--- 293,304 ----
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src, "package p; interface A extends pkg1.D { }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
!                 .options("--module-path", modules.toString(),
!                         "--upgrade-module-path", upgrade.toString(),
                          "-Xmodule:m1")
                  .files(findJavaFiles(src))
                  .run()
                  .writeAll();
      }