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

*** 61,71 ****
  
      @Test
      public void testError(Path base) throws Exception {
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
!                         "-modulesourcepath", src.toString())
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
  
--- 61,71 ----
  
      @Test
      public void testError(Path base) throws Exception {
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
!                         "--module-source-path", src.toString())
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
  
*** 76,86 ****
      @Test
      public void testProcOnly(Path base) throws IOException {
          new JavacTask(tb)
                  .options("-XDrawDiagnostics",
                          "-proc:only",
!                         "-modulesourcepath", src.toString())
                  .files(findJavaFiles(src))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
      }
  
--- 76,86 ----
      @Test
      public void testProcOnly(Path base) throws IOException {
          new JavacTask(tb)
                  .options("-XDrawDiagnostics",
                          "-proc:only",
!                         "--module-source-path", src.toString())
                  .files(findJavaFiles(src))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
      }
  
*** 88,98 ****
      public void testClassOutDir(Path base) throws IOException {
          Path classes = base.resolve("classes");
          new JavacTask(tb)
                  .options("-XDrawDiagnostics",
                          "-d", classes.toString(),
!                         "-modulesourcepath", src.toString())
                  .files(findJavaFiles(src))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
      }
  
--- 88,98 ----
      public void testClassOutDir(Path base) throws IOException {
          Path classes = base.resolve("classes");
          new JavacTask(tb)
                  .options("-XDrawDiagnostics",
                          "-d", classes.toString(),
!                         "--module-source-path", src.toString())
                  .files(findJavaFiles(src))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
      }
  
*** 118,128 ****
                  "class C { }");
  
          String log = new JavacTask(tb, Task.Mode.CMDLINE)
                  .outdir(modClasses) // an exploded module
                  .options("-XDrawDiagnostics",
!                         "-modulesourcepath", src.toString())
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
  
--- 118,128 ----
                  "class C { }");
  
          String log = new JavacTask(tb, Task.Mode.CMDLINE)
                  .outdir(modClasses) // an exploded module
                  .options("-XDrawDiagnostics",
!                         "--module-source-path", src.toString())
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
  
*** 155,165 ****
  
          String log = new JavacTask(tb, Task.Mode.CMDLINE)
                  .outdir(classes) // within an exploded module
                  .options("-XDrawDiagnostics",
                          "-Xlint", "-Werror",
!                         "-modulepath", modClasses.toString())
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
  
--- 155,165 ----
  
          String log = new JavacTask(tb, Task.Mode.CMDLINE)
                  .outdir(classes) // within an exploded module
                  .options("-XDrawDiagnostics",
                          "-Xlint", "-Werror",
!                         "--module-path", modClasses.toString())
                  .files(findJavaFiles(src))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);