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

*** 80,90 ****
                            "package test; public class B { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          new JavacTask(tb)
!           .options("-Werror", "-modulesourcepath", base.toString())
            .outdir(classes)
            .files(findJavaFiles(base))
            .run()
            .writeAll();
      }
--- 80,90 ----
                            "package test; public class B { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          new JavacTask(tb)
!           .options("-Werror", "--module-source-path", base.toString())
            .outdir(classes)
            .files(findJavaFiles(base))
            .run()
            .writeAll();
      }
*** 105,115 ****
                            "package impl; public class Impl { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          List<String> log = new JavacTask(tb)
!                        .options("-XDrawDiagnostics", "-modulesourcepath", base.toString())
                         .outdir(classes)
                         .files(findJavaFiles(base))
                         .run(Task.Expect.FAIL)
                         .writeAll()
                         .getOutputLines(Task.OutputKind.DIRECT);
--- 105,115 ----
                            "package impl; public class Impl { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          List<String> log = new JavacTask(tb)
!                        .options("-XDrawDiagnostics", "--module-source-path", base.toString())
                         .outdir(classes)
                         .files(findJavaFiles(base))
                         .run(Task.Expect.FAIL)
                         .writeAll()
                         .getOutputLines(Task.OutputKind.DIRECT);
*** 135,145 ****
                  .requires("N")
                  .classes("package pack; public class B { pack.A f; }")
                  .write(modSrc);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-mp", modules.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc.resolve("M")))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 135,145 ----
                  .requires("N")
                  .classes("package pack; public class B { pack.A f; }")
                  .write(modSrc);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-p", modules.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc.resolve("M")))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 160,170 ****
                  .requires("N")
                  .classes("package pack; public class C { publ.B b; }")
                  .write(modSrc);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-modulesourcepath", modSrc.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc))
                  .run(Task.Expect.SUCCESS)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 160,170 ----
                  .requires("N")
                  .classes("package pack; public class C { publ.B b; }")
                  .write(modSrc);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "--module-source-path", modSrc.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc))
                  .run(Task.Expect.SUCCESS)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 187,197 ****
                  .requires("N")
                  .classes("package pack; public class C { publ.B b; }")
                  .write(modSrc);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-mp", modules.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc.resolve("M")))
                  .run(Task.Expect.SUCCESS)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 187,197 ----
                  .requires("N")
                  .classes("package pack; public class C { publ.B b; }")
                  .write(modSrc);
  
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-p", modules.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc.resolve("M")))
                  .run(Task.Expect.SUCCESS)
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 218,228 ****
                  .requires("N")
                  .classes("package pkg; public class C { pack.A a; pack.B b; }")
                  .write(modSrc);
  
          List<String> log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-mp", modules.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc.resolve("K")))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
--- 218,228 ----
                  .requires("N")
                  .classes("package pkg; public class C { pack.A a; pack.B b; }")
                  .write(modSrc);
  
          List<String> log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-p", modules.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc.resolve("K")))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
*** 250,260 ****
          moduleK.requires("M")
                  .requires("N")
                  .classes("package p; public class DependsOnN { boolean f = pkg.A.flagN; } ")
                  .write(modSrc);
          new JavacTask(tb)
!                 .options("-modulesourcepath", modSrc.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc.resolve("K")))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
--- 250,260 ----
          moduleK.requires("M")
                  .requires("N")
                  .classes("package p; public class DependsOnN { boolean f = pkg.A.flagN; } ")
                  .write(modSrc);
          new JavacTask(tb)
!                 .options("--module-source-path", modSrc.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc.resolve("K")))
                  .run(Task.Expect.SUCCESS)
                  .writeAll();
  
*** 263,273 ****
                  .classes("package p; public class DependsOnM { boolean f = pkg.A.flagM; } ")
                  .write(modSrc);
  
          List<String> output = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
!                         "-modulesourcepath", modSrc.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc.resolve("K")))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
--- 263,273 ----
                  .classes("package p; public class DependsOnM { boolean f = pkg.A.flagM; } ")
                  .write(modSrc);
  
          List<String> output = new JavacTask(tb)
                  .options("-XDrawDiagnostics",
!                         "--module-source-path", modSrc.toString())
                  .outdir(Files.createDirectories(base.resolve("classes")))
                  .files(findJavaFiles(modSrc.resolve("K")))
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);