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

*** 152,162 ****
                  "module m2 { requires m1; uses p.C; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
!                 .options("-modulesourcepath", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
      }
--- 152,162 ----
                  "module m2 { requires m1; uses p.C; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
!                 .options("--module-source-path", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
      }
*** 173,183 ****
                  .requires("m1")
                  .uses("p.C")
                  .write(modSrc);
  
          new JavacTask(tb)
!                 .options("-mp", modules.toString())
                  .outdir(modules)
                  .files(findJavaFiles(modSrc.resolve("m2")))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
      }
--- 173,183 ----
                  .requires("m1")
                  .uses("p.C")
                  .write(modSrc);
  
          new JavacTask(tb)
!                 .options("-p", modules.toString())
                  .outdir(modules)
                  .files(findJavaFiles(modSrc.resolve("m2")))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
      }
*** 194,204 ****
                  .requires("m1")
                  .uses("p.C.Inner")
                  .write(modSrc);
  
          new JavacTask(tb)
!                 .options("-mp", modules.toString())
                  .outdir(modules)
                  .files(findJavaFiles(modSrc.resolve("m2")))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
      }
--- 194,204 ----
                  .requires("m1")
                  .uses("p.C.Inner")
                  .write(modSrc);
  
          new JavacTask(tb)
!                 .options("-p", modules.toString())
                  .outdir(modules)
                  .files(findJavaFiles(modSrc.resolve("m2")))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
      }
*** 253,263 ****
                  "package p; public class C { }");
          tb.writeJavaFiles(src.resolve("m2"),
                  "module m2 { requires m1; uses p.C; }");
  
          List<String> output = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
                  .outdir(Files.createDirectories(base.resolve("modules")))
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
--- 253,263 ----
                  "package p; public class C { }");
          tb.writeJavaFiles(src.resolve("m2"),
                  "module m2 { requires m1; uses p.C; }");
  
          List<String> output = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                  .outdir(Files.createDirectories(base.resolve("modules")))
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
*** 277,287 ****
                  "package p; public class C { }");
          tb.writeJavaFiles(src.resolve("m2"),
                  "module m2 { requires m1; uses p.C; }");
  
          List<String> output = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
                  .outdir(Files.createDirectories(base.resolve("modules")))
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
--- 277,287 ----
                  "package p; public class C { }");
          tb.writeJavaFiles(src.resolve("m2"),
                  "module m2 { requires m1; uses p.C; }");
  
          List<String> output = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                  .outdir(Files.createDirectories(base.resolve("modules")))
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);