test/tools/javac/modules/MultiModuleModeTest.java

*** 58,68 ****
          Path classes = base.resolve("classes");
          tb.createDirectories(classes);
  
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
!                         "-modulesourcepath", src.toString())
                  .outdir(classes)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 58,68 ----
          Path classes = base.resolve("classes");
          tb.createDirectories(classes);
  
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
!                         "--module-source-path", src.toString())
                  .outdir(classes)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 81,91 ****
          Path classes = base.resolve("classes");
          tb.createDirectories(classes);
  
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
!                         "-modulesourcepath", src.toString())
                  .outdir(classes)
                  .files(join(findJavaFiles(src), findJavaFiles(misc)))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 81,91 ----
          Path classes = base.resolve("classes");
          tb.createDirectories(classes);
  
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
!                         "--module-source-path", src.toString())
                  .outdir(classes)
                  .files(join(findJavaFiles(src), findJavaFiles(misc)))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 102,112 ****
          Path classes = base.resolve("classes");
          tb.createDirectories(classes);
  
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
!                         "-modulesourcepath", src.toString())
                  .outdir(classes)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 102,112 ----
          Path classes = base.resolve("classes");
          tb.createDirectories(classes);
  
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
!                         "--module-source-path", src.toString())
                  .outdir(classes)
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 122,132 ****
          tb.writeJavaFiles(src.resolve("m2"), "module m2 { requires m1; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
!                 .options("-modulesourcepath", src.toString())
                  .outdir(modules)
                  .files(src.resolve("m2/module-info.java"))
                  .run()
                  .writeAll();
      }
--- 122,132 ----
          tb.writeJavaFiles(src.resolve("m2"), "module m2 { requires m1; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
!                 .options("--module-source-path", src.toString())
                  .outdir(modules)
                  .files(src.resolve("m2/module-info.java"))
                  .run()
                  .writeAll();
      }
*** 137,147 ****
          tb.writeJavaFiles(src1.resolve("m1"), "module m1 { }");
          Path modules1 = base.resolve("modules1");
          Files.createDirectories(modules1);
  
          new JavacTask(tb)
!                 .options("-modulesourcepath", src1.toString())
                  .outdir(modules1)
                  .files(src1.resolve("m1/module-info.java"))
                  .run()
                  .writeAll();
  
--- 137,147 ----
          tb.writeJavaFiles(src1.resolve("m1"), "module m1 { }");
          Path modules1 = base.resolve("modules1");
          Files.createDirectories(modules1);
  
          new JavacTask(tb)
!                 .options("--module-source-path", src1.toString())
                  .outdir(modules1)
                  .files(src1.resolve("m1/module-info.java"))
                  .run()
                  .writeAll();
  
*** 149,160 ****
          tb.writeJavaFiles(src2.resolve("m2"), "module m2 { requires m1; }");
          Path modules2 = base.resolve("modules2");
          Files.createDirectories(modules2);
  
          new JavacTask(tb)
!                 .options("-modulepath", modules1.toString(),
!                         "-modulesourcepath", src2.toString())
                  .outdir(modules2)
                  .files(src2.resolve("m2/module-info.java"))
                  .run()
                  .writeAll();
      }
--- 149,160 ----
          tb.writeJavaFiles(src2.resolve("m2"), "module m2 { requires m1; }");
          Path modules2 = base.resolve("modules2");
          Files.createDirectories(modules2);
  
          new JavacTask(tb)
!                 .options("--module-path", modules1.toString(),
!                         "--module-source-path", src2.toString())
                  .outdir(modules2)
                  .files(src2.resolve("m2/module-info.java"))
                  .run()
                  .writeAll();
      }