archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +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

24
langtools/test/tools/javac/modules/QueryBeforeEnter.java
View file

@ -94,7 +94,7 @@ public class QueryBeforeEnter extends ModuleTestBase {
Files.createDirectories(modulePath);
new JavacTask(tb)
.options("-modulesourcepath", moduleSrc.toString())
.options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run()
@ -131,8 +131,8 @@ public class QueryBeforeEnter extends ModuleTestBase {
(com.sun.source.util.JavacTask) javaCompiler.getTask(null,
null,
d -> { throw new IllegalStateException(d.toString()); },
Arrays.asList("-modulepath", modulePath.toString(),
"-classpath", cp.toString(),
Arrays.asList("--module-path", modulePath.toString(),
"--class-path", cp.toString(),
"-sourcepath", src.toString()),
null,
fm.getJavaFileObjects(src.resolve("test").resolve("Test2.java")));
@ -170,7 +170,7 @@ public class QueryBeforeEnter extends ModuleTestBase {
Files.createDirectories(modulePath);
new JavacTask(tb)
.options("-modulesourcepath", moduleSrc.toString())
.options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run()
@ -207,8 +207,8 @@ public class QueryBeforeEnter extends ModuleTestBase {
(com.sun.source.util.JavacTask) javaCompiler.getTask(null,
null,
d -> { throw new IllegalStateException(d.toString()); },
Arrays.asList("-modulepath", modulePath.toString(),
"-classpath", cp.toString(),
Arrays.asList("--module-path", modulePath.toString(),
"--class-path", cp.toString(),
"-sourcepath", src.toString()),
null,
fm.getJavaFileObjects(findJavaFiles(src)));
@ -245,7 +245,7 @@ public class QueryBeforeEnter extends ModuleTestBase {
Files.createDirectories(modulePath);
new JavacTask(tb)
.options("-modulesourcepath", modulePathSrc.toString())
.options("--module-source-path", modulePathSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(modulePathSrc))
.run()
@ -289,9 +289,9 @@ public class QueryBeforeEnter extends ModuleTestBase {
(com.sun.source.util.JavacTask) javaCompiler.getTask(null,
null,
d -> { throw new IllegalStateException(d.toString()); },
Arrays.asList("-modulepath", modulePath.toString(),
"-classpath", cp.toString(),
"-modulesourcepath", moduleSrc.toString(),
Arrays.asList("--module-path", modulePath.toString(),
"--class-path", cp.toString(),
"--module-source-path", moduleSrc.toString(),
"-d", out.toString()),
null,
fm.getJavaFileObjects(findJavaFiles(moduleSrc)));
@ -339,7 +339,7 @@ public class QueryBeforeEnter extends ModuleTestBase {
(com.sun.source.util.JavacTask) javaCompiler.getTask(null,
null,
d -> { throw new IllegalStateException(d.toString()); },
Arrays.asList("-processorpath", processorPath,
Arrays.asList("--processor-path", processorPath,
"-processor", AP.class.getName(),
"-Xplugin:test"),
null,
@ -347,7 +347,7 @@ public class QueryBeforeEnter extends ModuleTestBase {
task.call();
}
Main.compile(new String[] {"-processorpath", processorPath,
Main.compile(new String[] {"--processor-path", processorPath,
"-Xplugin:test",
testSource.toString()});
}