8136930: Simplify use of module-system options by custom launchers

8160489: Multiple -Xpatch lines ignored by javac
8156998: javac should support new option -XinheritRuntimeEnvironment

Reviewed-by: jlahoda, ksrini
This commit is contained in:
Jonathan Gibbons 2016-08-10 15:47:46 -07:00
parent 3b80559162
commit 978417c4c7
161 changed files with 2421 additions and 1050 deletions

View file

@ -63,7 +63,7 @@ public class EnvVarTest extends ModuleTestBase {
tb.out.println("test that addExports can be given to javac");
new JavacTask(tb)
.options("-XaddExports:jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED")
.options("--add-exports", "jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED")
.outdir(classes)
.files(findJavaFiles(src))
.run(Expect.SUCCESS)
@ -71,7 +71,7 @@ public class EnvVarTest extends ModuleTestBase {
tb.out.println("test that addExports can be provided with env variable");
new JavacTask(tb, Mode.EXEC)
.envVar("_JAVAC_OPTIONS", "-XaddExports:jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED")
.envVar("_JAVAC_OPTIONS", "--add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED")
.outdir(classes)
.files(findJavaFiles(src))
.run(Expect.SUCCESS)
@ -80,7 +80,7 @@ public class EnvVarTest extends ModuleTestBase {
tb.out.println("test that addExports can be provided with env variable using @file");
Path atFile = src.resolve("at-file.txt");
tb.writeFile(atFile,
"-XaddExports:jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED");
"--add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED");
new JavacTask(tb, Mode.EXEC)
.envVar("_JAVAC_OPTIONS", "@" + atFile)