test/tools/javac/modules/AddReadsTest.java

rev 3947 : imported patch xmodule-to-patch-module

*** 215,225 ****
                            "package impl; public class Impl { api.Api a; }");
  
          new JavacTask(tb)
            .options("--class-path", jar.toString(),
                     "--add-reads", "java.base=ALL-UNNAMED",
!                    "-Xmodule:java.base")
            .outdir(classes)
            .files(src.resolve("impl").resolve("Impl.java"))
            .run()
            .writeAll();
      }
--- 215,225 ----
                            "package impl; public class Impl { api.Api a; }");
  
          new JavacTask(tb)
            .options("--class-path", jar.toString(),
                     "--add-reads", "java.base=ALL-UNNAMED",
!                    "--patch-module", "java.base=" + src.toString())
            .outdir(classes)
            .files(src.resolve("impl").resolve("Impl.java"))
            .run()
            .writeAll();
      }
*** 235,245 ****
                            "package impl; public class Impl { javax.swing.JButton b; }");
  
          new JavacTask(tb)
            .options("--add-modules", "java.desktop",
                     "--add-reads", "java.base=java.desktop",
!                    "-Xmodule:java.base")
            .outdir(classes)
            .files(findJavaFiles(src))
            .run()
            .writeAll();
      }
--- 235,245 ----
                            "package impl; public class Impl { javax.swing.JButton b; }");
  
          new JavacTask(tb)
            .options("--add-modules", "java.desktop",
                     "--add-reads", "java.base=java.desktop",
!                    "--patch-module", "java.base=" + src)
            .outdir(classes)
            .files(findJavaFiles(src))
            .run()
            .writeAll();
      }
*** 302,312 ****
          tb.writeJavaFiles(unnamedSrc,
                            "package impl; public class Impl { }");
  
          new JavacTask(tb)
            .options("--add-reads", "m1x=ALL-UNNAMED",
!                    "-Xmodule:m1x",
                     "--module-path", classes.toString())
            .outdir(unnamedClasses)
            .files(findJavaFiles(unnamedSrc))
            .run()
            .writeAll();
--- 302,312 ----
          tb.writeJavaFiles(unnamedSrc,
                            "package impl; public class Impl { }");
  
          new JavacTask(tb)
            .options("--add-reads", "m1x=ALL-UNNAMED",
!                    "--patch-module", "m1x=" + unnamedSrc.toString(),
                     "--module-path", classes.toString())
            .outdir(unnamedClasses)
            .files(findJavaFiles(unnamedSrc))
            .run()
            .writeAll();