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 OutputDirTest extends ModuleTestBase {
public void testError(Path base) throws Exception {
String log = new JavacTask(tb)
.options("-XDrawDiagnostics",
"-modulesourcepath", src.toString())
"--module-source-path", src.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
@ -78,7 +78,7 @@ public class OutputDirTest extends ModuleTestBase {
new JavacTask(tb)
.options("-XDrawDiagnostics",
"-proc:only",
"-modulesourcepath", src.toString())
"--module-source-path", src.toString())
.files(findJavaFiles(src))
.run(Task.Expect.SUCCESS)
.writeAll();
@ -90,7 +90,7 @@ public class OutputDirTest extends ModuleTestBase {
new JavacTask(tb)
.options("-XDrawDiagnostics",
"-d", classes.toString(),
"-modulesourcepath", src.toString())
"--module-source-path", src.toString())
.files(findJavaFiles(src))
.run(Task.Expect.SUCCESS)
.writeAll();
@ -120,7 +120,7 @@ public class OutputDirTest extends ModuleTestBase {
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(modClasses) // an exploded module
.options("-XDrawDiagnostics",
"-modulesourcepath", src.toString())
"--module-source-path", src.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
@ -157,7 +157,7 @@ public class OutputDirTest extends ModuleTestBase {
.outdir(classes) // within an exploded module
.options("-XDrawDiagnostics",
"-Xlint", "-Werror",
"-modulepath", modClasses.toString())
"--module-path", modClasses.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()