archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 10:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

16
langtools/test/tools/javac/modules/PackageConflictTest.java
View file

@ -82,7 +82,7 @@ public class PackageConflictTest extends ModuleTestBase {
Files.createDirectories(classes);
new JavacTask(tb)
.options("-Werror", "-modulesourcepath", base.toString())
.options("-Werror", "--module-source-path", base.toString())
.outdir(classes)
.files(findJavaFiles(base))
.run()
@ -107,7 +107,7 @@ public class PackageConflictTest extends ModuleTestBase {
Files.createDirectories(classes);
List<String> log = new JavacTask(tb)
.options("-XDrawDiagnostics", "-modulesourcepath", base.toString())
.options("-XDrawDiagnostics", "--module-source-path", base.toString())
.outdir(classes)
.files(findJavaFiles(base))
.run(Task.Expect.FAIL)
@ -137,7 +137,7 @@ public class PackageConflictTest extends ModuleTestBase {
.write(modSrc);
String log = new JavacTask(tb)
.options("-XDrawDiagnostics", "-mp", modules.toString())
.options("-XDrawDiagnostics", "-p", modules.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc.resolve("M")))
.run(Task.Expect.FAIL)
@ -162,7 +162,7 @@ public class PackageConflictTest extends ModuleTestBase {
.write(modSrc);
String log = new JavacTask(tb)
.options("-XDrawDiagnostics", "-modulesourcepath", modSrc.toString())
.options("-XDrawDiagnostics", "--module-source-path", modSrc.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc))
.run(Task.Expect.SUCCESS)
@ -189,7 +189,7 @@ public class PackageConflictTest extends ModuleTestBase {
.write(modSrc);
String log = new JavacTask(tb)
.options("-XDrawDiagnostics", "-mp", modules.toString())
.options("-XDrawDiagnostics", "-p", modules.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc.resolve("M")))
.run(Task.Expect.SUCCESS)
@ -220,7 +220,7 @@ public class PackageConflictTest extends ModuleTestBase {
.write(modSrc);
List<String> log = new JavacTask(tb)
.options("-XDrawDiagnostics", "-mp", modules.toString())
.options("-XDrawDiagnostics", "-p", modules.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc.resolve("K")))
.run(Task.Expect.FAIL)
@ -252,7 +252,7 @@ public class PackageConflictTest extends ModuleTestBase {
.classes("package p; public class DependsOnN { boolean f = pkg.A.flagN; } ")
.write(modSrc);
new JavacTask(tb)
.options("-modulesourcepath", modSrc.toString())
.options("--module-source-path", modSrc.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc.resolve("K")))
.run(Task.Expect.SUCCESS)
@ -265,7 +265,7 @@ public class PackageConflictTest extends ModuleTestBase {
List<String> output = new JavacTask(tb)
.options("-XDrawDiagnostics",
"-modulesourcepath", modSrc.toString())
"--module-source-path", modSrc.toString())
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(modSrc.resolve("K")))
.run(Task.Expect.FAIL)