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

*** 134,144 ****
                  anno_proc2,
                  annotationProcessorModule2,
                  annotationProcessor2);
  
          String log = new JavacTask(tb)
!                 .options("-modulesourcepath", moduleSrc.toString())
                  .outdir(processorCompiledModules)
                  .files(findJavaFiles(moduleSrc))
                  .run()
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
--- 134,144 ----
                  anno_proc2,
                  annotationProcessorModule2,
                  annotationProcessor2);
  
          String log = new JavacTask(tb)
!                 .options("--module-source-path", moduleSrc.toString())
                  .outdir(processorCompiledModules)
                  .files(findJavaFiles(moduleSrc))
                  .run()
                  .writeAll()
                  .getOutput(Task.OutputKind.DIRECT);
*** 157,167 ****
  
      @Test
      public void testUseOnlyOneProcessor(Path base) throws Exception {
          initialization(base);
          String log = new JavacTask(tb)
!                 .options("-processormodulepath", processorCompiledModules.toString(),
                          "-processor", "mypkg2.MyProcessor2")
                  .outdir(classes)
                  .sources(testClass)
                  .run()
                  .writeAll()
--- 157,167 ----
  
      @Test
      public void testUseOnlyOneProcessor(Path base) throws Exception {
          initialization(base);
          String log = new JavacTask(tb)
!                 .options("--processor-module-path", processorCompiledModules.toString(),
                          "-processor", "mypkg2.MyProcessor2")
                  .outdir(classes)
                  .sources(testClass)
                  .run()
                  .writeAll()
*** 173,183 ****
  
      @Test
      public void testAnnotationProcessorExecutionOrder(Path base) throws Exception {
          initialization(base);
          List<String> log = new JavacTask(tb)
!                 .options("-processormodulepath", processorCompiledModules.toString(),
                          "-processor", "mypkg1.MyProcessor1,mypkg2.MyProcessor2")
                  .outdir(classes)
                  .sources(testClass)
                  .run()
                  .writeAll()
--- 173,183 ----
  
      @Test
      public void testAnnotationProcessorExecutionOrder(Path base) throws Exception {
          initialization(base);
          List<String> log = new JavacTask(tb)
!                 .options("--processor-module-path", processorCompiledModules.toString(),
                          "-processor", "mypkg1.MyProcessor1,mypkg2.MyProcessor2")
                  .outdir(classes)
                  .sources(testClass)
                  .run()
                  .writeAll()
*** 186,196 ****
                                        "the annotation processor 2 is working!"))) {
              throw new AssertionError("Unexpected output: " + log);
          }
  
          log = new JavacTask(tb)
!                 .options("-processormodulepath", processorCompiledModules.toString(),
                          "-processor", "mypkg2.MyProcessor2,mypkg1.MyProcessor1")
                  .outdir(classes)
                  .sources(testClass)
                  .run()
                  .writeAll()
--- 186,196 ----
                                        "the annotation processor 2 is working!"))) {
              throw new AssertionError("Unexpected output: " + log);
          }
  
          log = new JavacTask(tb)
!                 .options("--processor-module-path", processorCompiledModules.toString(),
                          "-processor", "mypkg2.MyProcessor2,mypkg1.MyProcessor1")
                  .outdir(classes)
                  .sources(testClass)
                  .run()
                  .writeAll()
*** 203,213 ****
  
      @Test
      public void testErrorOutputIfOneProcessorNameIsIncorrect(Path base) throws Exception {
          initialization(base);
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-processormodulepath", processorCompiledModules.toString(),
                           "-processor", "mypkg2.MyProcessor2,noPackage.noProcessor,mypkg1.MyProcessor1")
                  .outdir(classes)
                  .sources(testClass)
                  .run(Task.Expect.FAIL)
                  .writeAll()
--- 203,214 ----
  
      @Test
      public void testErrorOutputIfOneProcessorNameIsIncorrect(Path base) throws Exception {
          initialization(base);
          String log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics",
!                          "--processor-module-path", processorCompiledModules.toString(),
                           "-processor", "mypkg2.MyProcessor2,noPackage.noProcessor,mypkg1.MyProcessor1")
                  .outdir(classes)
                  .sources(testClass)
                  .run(Task.Expect.FAIL)
                  .writeAll()
*** 219,230 ****
  
      @Test
      public void testOptionsExclusion(Path base) throws Exception {
          initialization(base);
          List<String> log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics", "-processormodulepath", processorCompiledModules.toString(),
!                         "-processorpath", processorCompiledModules.toString())
                  .outdir(classes)
                  .sources(testClass)
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);
--- 220,232 ----
  
      @Test
      public void testOptionsExclusion(Path base) throws Exception {
          initialization(base);
          List<String> log = new JavacTask(tb)
!                 .options("-XDrawDiagnostics",
!                         "--processor-module-path", processorCompiledModules.toString(),
!                         "--processor-path", processorCompiledModules.toString())
                  .outdir(classes)
                  .sources(testClass)
                  .run(Task.Expect.FAIL)
                  .writeAll()
                  .getOutputLines(Task.OutputKind.DIRECT);