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

*** 91,101 ****
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 91,101 ----
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 115,125 ****
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 115,125 ----
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 141,151 ****
                  "module m3 { requires m1; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 141,151 ----
                  "module m3 { requires m1; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 165,175 ****
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 165,175 ----
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 189,199 ****
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run()
                  .writeAll();
      }
--- 189,199 ----
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run()
                  .writeAll();
      }
*** 209,219 ****
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run()
                  .writeAll();
      }
--- 209,219 ----
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                  .outdir(modules)
                  .files(findJavaFiles(src))
                  .run()
                  .writeAll();
      }