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

*** 343,352 ****
--- 343,353 ----
          tb.writeJavaFiles(classpathSrc,
                            generateCheckAccessibleClass("cp.CP"));
  
          Files.createDirectories(classpathOut);
  
+         System.err.println("Compiling classpath-src files:");
          new JavacTask(tb)
                  .outdir(classpathOut)
                  .files(findJavaFiles(classpathSrc))
                  .run()
                  .writeAll()
*** 358,367 ****
--- 359,369 ----
          tb.writeJavaFiles(automaticSrc,
                            generateCheckAccessibleClass("automatic.Automatic"));
  
          Files.createDirectories(automaticOut);
  
+         System.err.println("Compiling automatic-src files:");
          new JavacTask(tb)
                  .outdir(automaticOut)
                  .files(findJavaFiles(automaticSrc))
                  .run()
                  .writeAll()
*** 371,380 ****
--- 373,383 ----
  
          Files.createDirectories(modulePath);
  
          Path automaticJar = modulePath.resolve("automatic.jar");
  
+         System.err.println("Creating automatic.jar:");
          new JarTask(tb, automaticJar)
            .baseDir(automaticOut)
            .files("automatic/Automatic.class")
            .run();
  
*** 383,392 ****
--- 386,396 ----
  
          tb.writeJavaFiles(m1,
                            "module m1 { exports api; }",
                            "package api; public class Api { public void test() { } }");
  
+         System.err.println("Compiling module-src files:");
          new JavacTask(tb)
                  .options("--module-source-path", moduleSrc.toString())
                  .outdir(modulePath)
                  .files(findJavaFiles(moduleSrc))
                  .run()
*** 397,407 ****
  
          for (String moduleInfo : MODULE_INFO_VARIANTS) {
              for (String[] options : OPTIONS_VARIANTS) {
                  index++;
  
!                 System.err.println("running check: " + moduleInfo + "; " + Arrays.asList(options));
  
                  Path m2Runtime = base.resolve(index + "-runtime").resolve("m2");
                  Path out = base.resolve(index + "-runtime").resolve("out").resolve("m2");
  
                  Files.createDirectories(out);
--- 401,411 ----
  
          for (String moduleInfo : MODULE_INFO_VARIANTS) {
              for (String[] options : OPTIONS_VARIANTS) {
                  index++;
  
!                 System.err.println("Running check: " + moduleInfo + "; " + Arrays.asList(options));
  
                  Path m2Runtime = base.resolve(index + "-runtime").resolve("m2");
                  Path out = base.resolve(index + "-runtime").resolve("out").resolve("m2");
  
                  Files.createDirectories(out);
*** 425,434 ****
--- 429,439 ----
                  testClassNamed.append("    }\n" +
                                        "}");
  
                  tb.writeJavaFiles(m2Runtime, moduleInfo, testClassNamed.toString());
                  
+                 System.err.println("Compiling " + m2Runtime + " files:");
                  new JavacTask(tb)
                     .options("--module-path", modulePath.toString())
                     .outdir(out)
                     .files(findJavaFiles(m2Runtime))
                     .run()
*** 436,445 ****
--- 441,451 ----
  
                  boolean success;
                  String output;
  
                  try {
+                     System.err.println("Running m2/test.Test:");
                      output = new JavaTask(tb)
                         .vmOptions(augmentOptions(options,
                                                   Collections.emptyList(),
                                                   "--module-path", modulePath.toString() + File.pathSeparator + out.getParent().toString(),
                                                   "--class-path", classpathOut.toString(),
*** 466,475 ****
--- 472,483 ----
                      "--processor-path", System.getProperty("test.class.path"),
                      "-processor", CheckVisibleModule.class.getName(),
                      "-Aoutput=" + output,
                      "-XDaccessInternalAPI=true"
                  ) : Collections.emptyList();
+ 
+                 System.err.println("Compiling/processing m2 files:");
                  new JavacTask(tb)
                     .options(augmentOptions(options,
                                             auxOptions,
                                             "--module-path", modulePath.toString(),
                                             "--class-path", classpathOut.toString(),
*** 508,519 ****
  
      static {
          MODULES_TO_CHECK_TO_SAMPLE_CLASS.put("m1", "api.Api");
          MODULES_TO_CHECK_TO_SAMPLE_CLASS.put("m2", "test.Test");
          MODULES_TO_CHECK_TO_SAMPLE_CLASS.put("java.base", "java.lang.Object");
-         MODULES_TO_CHECK_TO_SAMPLE_CLASS.put("java.compiler", "javax.tools.ToolProvider");
-         MODULES_TO_CHECK_TO_SAMPLE_CLASS.put("jdk.compiler", "com.sun.tools.javac.Main");
      };
  
      @SupportedAnnotationTypes("*")
      @SupportedOptions("output")
      public static final class CheckVisibleModule extends AbstractProcessor {
--- 516,525 ----
*** 571,582 ****
          return all.toArray(new String[0]);
      }
  
      private static final String[] MODULE_INFO_VARIANTS = {
          "module m2 { exports test; }",
!         "module m2 { requires m1; exports test; }",
!         "module m2 { requires jdk.compiler; exports test; }",
      };
  
      private static final String[][] OPTIONS_VARIANTS = {
          {"--add-modules", "automatic"},
          {"--add-modules", "m1,automatic"},
--- 577,587 ----
          return all.toArray(new String[0]);
      }
  
      private static final String[] MODULE_INFO_VARIANTS = {
          "module m2 { exports test; }",
!         "module m2 { requires m1; exports test; }"
      };
  
      private static final String[][] OPTIONS_VARIANTS = {
          {"--add-modules", "automatic"},
          {"--add-modules", "m1,automatic"},