test/tools/launcher/ToolsOpts.java

rev 16468 : [mq]: xmodule-to-patch-module

*** 85,99 ****
          contents.add("           if(x.compareTo(\" \")!=0)\n");
          contents.add("               System.out.println(x);\n");
          contents.add("       }\n");
          contents.add("    }\n");
          contents.add("}\n");
!         createFile(new File(mainJava), contents);
  
          // compile Main.java into directory to override classes in jdk.compiler
          new File("jdk.compiler").mkdir();
!         compile("-Xmodule:jdk.compiler", "-d", "jdk.compiler", mainJava);
      }
  
      static void pass(String msg) {
          System.out.println("pass: " + msg);
      }
--- 85,104 ----
          contents.add("           if(x.compareTo(\" \")!=0)\n");
          contents.add("               System.out.println(x);\n");
          contents.add("       }\n");
          contents.add("    }\n");
          contents.add("}\n");
!         String mainJavaPath = "patch-src/com/sun/tools/javac/" + mainJava;
!         File mainJavaFile = new File(mainJavaPath.replace('/', File.separatorChar));
!         mainJavaFile.getParentFile().mkdirs();
!         createFile(mainJavaFile, contents);
  
          // compile Main.java into directory to override classes in jdk.compiler
          new File("jdk.compiler").mkdir();
!         compile("--patch-module", "jdk.compiler=patch-src",
!                 "-d", "jdk.compiler",
!                 mainJavaFile.toString());
      }
  
      static void pass(String msg) {
          System.out.println("pass: " + msg);
      }