test/tools/javac/synthesize/Main.java

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

*** 90,118 ****
  
      void compile(boolean stdBootClassPath, List<String> files) {
          File empty = new File("empty");
          empty.mkdirs();
  
          List<String> args = new ArrayList<String>();
          args.add("-classpath");
          args.add("empty");
  
          if (stdBootClassPath) {
!             args.add("-Xmodule:java.base");
          } else {
              args.add("--system");
              args.add("none");
              files.add("module-info.java");
          }
  
  
          args.add("-d");
          args.add(".");
  
-         // files to compile are in a separate directory from test to avoid
-         // confusing jtreg
-         File src = new File(testSrc, "src");
          for (String f: files)
              args.add(new File(src, f).getPath());
  
          System.out.println("Compile: " + args);
          StringWriter out = new StringWriter();
--- 90,120 ----
  
      void compile(boolean stdBootClassPath, List<String> files) {
          File empty = new File("empty");
          empty.mkdirs();
  
+         // files to compile are in a separate directory from test to avoid
+         // confusing jtreg
+         File src = new File(testSrc, "src");
+ 
          List<String> args = new ArrayList<String>();
          args.add("-classpath");
          args.add("empty");
  
          if (stdBootClassPath) {
!             args.add("--patch-module");
!             args.add("java.base=" + testSrc.getAbsolutePath());
          } else {
              args.add("--system");
              args.add("none");
              files.add("module-info.java");
          }
  
  
          args.add("-d");
          args.add(".");
  
          for (String f: files)
              args.add(new File(src, f).getPath());
  
          System.out.println("Compile: " + args);
          StringWriter out = new StringWriter();