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

*** 56,66 ****
          tb.writeJavaFiles(m1,
                  "module m1 {}",
                  "package test; public class Test {}");
  
          new JavacTask(tb)
!                 .options("-m", "m1", "-modulesourcepath", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          Path moduleInfoClass = build.resolve("m1/module-info.class");
          Path testTestClass = build.resolve("m1/test/Test.class");
--- 56,66 ----
          tb.writeJavaFiles(m1,
                  "module m1 {}",
                  "package test; public class Test {}");
  
          new JavacTask(tb)
!                 .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          Path moduleInfoClass = build.resolve("m1/module-info.class");
          Path testTestClass = build.resolve("m1/test/Test.class");
*** 79,89 ****
          }
  
          Thread.sleep(2000); //timestamps
  
          new JavacTask(tb)
!                 .options("-m", "m1", "-modulesourcepath", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          if (!moduleInfoTimeStamp.equals(Files.getLastModifiedTime(moduleInfoClass))) {
              throw new AssertionError("Classfile update!");
--- 79,89 ----
          }
  
          Thread.sleep(2000); //timestamps
  
          new JavacTask(tb)
!                 .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          if (!moduleInfoTimeStamp.equals(Files.getLastModifiedTime(moduleInfoClass))) {
              throw new AssertionError("Classfile update!");
*** 96,106 ****
          Thread.sleep(2000); //timestamps
  
          Files.setLastModifiedTime(testTest, FileTime.fromMillis(System.currentTimeMillis()));
  
          new JavacTask(tb)
!                 .options("-m", "m1", "-modulesourcepath", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          if (!moduleInfoTimeStamp.equals(Files.getLastModifiedTime(moduleInfoClass))) {
              throw new AssertionError("Classfile update!");
--- 96,106 ----
          Thread.sleep(2000); //timestamps
  
          Files.setLastModifiedTime(testTest, FileTime.fromMillis(System.currentTimeMillis()));
  
          new JavacTask(tb)
!                 .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          if (!moduleInfoTimeStamp.equals(Files.getLastModifiedTime(moduleInfoClass))) {
              throw new AssertionError("Classfile update!");
*** 123,133 ****
                  "package test; public class Test {}");
  
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
                      "-m", "m1",
!                     "-modulesourcepath", src.toString())
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
  
          if (!log.contains("- compiler.err.output.dir.must.be.specified.with.dash.m.option"))
--- 123,133 ----
                  "package test; public class Test {}");
  
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
                      "-m", "m1",
!                     "--module-source-path", src.toString())
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
  
          if (!log.contains("- compiler.err.output.dir.must.be.specified.with.dash.m.option"))
*** 172,182 ****
          tb.writeJavaFiles(m2,
                  "module m2 {}",
                  "package p2; public class C2 {}");
  
          new JavacTask(tb)
!                 .options("-m", "m1,m2", "-modulesourcepath", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          Path m1ModuleInfoClass = build.resolve("m1/module-info.class");
          Path classC1 = build.resolve("m1/p1/C1.class");
--- 172,182 ----
          tb.writeJavaFiles(m2,
                  "module m2 {}",
                  "package p2; public class C2 {}");
  
          new JavacTask(tb)
!                 .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          Path m1ModuleInfoClass = build.resolve("m1/module-info.class");
          Path classC1 = build.resolve("m1/p1/C1.class");
*** 213,223 ****
          }
  
          Thread.sleep(2000); //timestamps
  
          new JavacTask(tb)
!                 .options("-m", "m1,m2", "-modulesourcepath", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          if (!m1ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m1ModuleInfoClass))) {
              throw new AssertionError("Classfile update!");
--- 213,223 ----
          }
  
          Thread.sleep(2000); //timestamps
  
          new JavacTask(tb)
!                 .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          if (!m1ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m1ModuleInfoClass))) {
              throw new AssertionError("Classfile update!");
*** 239,249 ****
  
          Files.setLastModifiedTime(C1Source, FileTime.fromMillis(System.currentTimeMillis()));
          Files.setLastModifiedTime(C2Source, FileTime.fromMillis(System.currentTimeMillis()));
  
          new JavacTask(tb)
!                 .options("-m", "m1,m2", "-modulesourcepath", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          if (!m1ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m1ModuleInfoClass))) {
              throw new AssertionError("Classfile update!");
--- 239,249 ----
  
          Files.setLastModifiedTime(C1Source, FileTime.fromMillis(System.currentTimeMillis()));
          Files.setLastModifiedTime(C2Source, FileTime.fromMillis(System.currentTimeMillis()));
  
          new JavacTask(tb)
!                 .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
          if (!m1ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m1ModuleInfoClass))) {
              throw new AssertionError("Classfile update!");