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

@ -117,7 +117,7 @@ public class GraphsTest extends ModuleTestBase {
.write(base.resolve("positiveSrc"));
new JavacTask(tb)
.options("-XDrawDiagnostics", "-mp", modules + File.pathSeparator + jarModules)
.options("-XDrawDiagnostics", "-p", modules + File.pathSeparator + jarModules)
.outdir(Files.createDirectories(base.resolve("positive")))
.files(findJavaFiles(positiveSrc))
.run()
@ -126,7 +126,7 @@ public class GraphsTest extends ModuleTestBase {
Path negativeSrc = m.classes("package p; public class Negative { closedO.O o; closedN.N n; closedL.L l; }")
.write(base.resolve("negativeSrc"));
List<String> log = new JavacTask(tb)
.options("-XDrawDiagnostics", "-mp", modules + File.pathSeparator + jarModules)
.options("-XDrawDiagnostics", "-p", modules + File.pathSeparator + jarModules)
.outdir(Files.createDirectories(base.resolve("negative")))
.files(findJavaFiles(negativeSrc))
.run(Task.Expect.FAIL)
@ -144,8 +144,8 @@ public class GraphsTest extends ModuleTestBase {
m.write(modSrc);
List<String> out = new JavacTask(tb)
.options("-XDrawDiagnostics",
"-modulesourcepath", modSrc.toString(),
"-mp", jarModules.toString()
"--module-source-path", modSrc.toString(),
"-p", jarModules.toString()
)
.outdir(Files.createDirectories(base.resolve("negative")))
.files(findJavaFiles(modSrc))