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

@ -154,7 +154,7 @@ public class UsesTest extends ModuleTestBase {
Files.createDirectories(modules);
new JavacTask(tb)
.options("-modulesourcepath", src.toString())
.options("--module-source-path", src.toString())
.outdir(modules)
.files(findJavaFiles(src))
.run(Task.Expect.SUCCESS)
@ -175,7 +175,7 @@ public class UsesTest extends ModuleTestBase {
.write(modSrc);
new JavacTask(tb)
.options("-mp", modules.toString())
.options("-p", modules.toString())
.outdir(modules)
.files(findJavaFiles(modSrc.resolve("m2")))
.run(Task.Expect.SUCCESS)
@ -196,7 +196,7 @@ public class UsesTest extends ModuleTestBase {
.write(modSrc);
new JavacTask(tb)
.options("-mp", modules.toString())
.options("-p", modules.toString())
.outdir(modules)
.files(findJavaFiles(modSrc.resolve("m2")))
.run(Task.Expect.SUCCESS)
@ -255,7 +255,7 @@ public class UsesTest extends ModuleTestBase {
"module m2 { requires m1; uses p.C; }");
List<String> output = new JavacTask(tb)
.options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
.options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(Files.createDirectories(base.resolve("modules")))
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
@ -279,7 +279,7 @@ public class UsesTest extends ModuleTestBase {
"module m2 { requires m1; uses p.C; }");
List<String> output = new JavacTask(tb)
.options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
.options("-XDrawDiagnostics", "--module-source-path", src.toString())
.outdir(Files.createDirectories(base.resolve("modules")))
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)