--- a/langtools/test/tools/javac/modules/ModulesAndClassPathTest.java Wed Aug 10 13:52:02 2016 -0700
+++ b/langtools/test/tools/javac/modules/ModulesAndClassPathTest.java Wed Aug 10 15:47:46 2016 -0700
@@ -46,7 +46,6 @@
import toolbox.JarTask;
import toolbox.JavacTask;
import toolbox.Task;
-import toolbox.ToolBox;
public class ModulesAndClassPathTest extends ModuleTestBase {
@@ -70,7 +69,7 @@
"package impl; public class Impl { api.Api api; }");
List<String> modLog = new JavacTask(tb)
- .options("-classpath", jar.toString(),
+ .options("--class-path", jar.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
@@ -86,8 +85,8 @@
}
new JavacTask(tb)
- .options("-classpath", jar.toString(),
- "-XaddReads:m1=ALL-UNNAMED")
+ .options("--class-path", jar.toString(),
+ "--add-reads", "m1=ALL-UNNAMED")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
@@ -95,8 +94,8 @@
.getOutputLines(Task.OutputKind.DIRECT);
new JavacTask(tb)
- .options("-classpath", jar.toString() + File.pathSeparator + System.getProperty("test.classes"),
- "-XaddReads:m1=ALL-UNNAMED",
+ .options("--class-path", jar.toString() + File.pathSeparator + System.getProperty("test.classes"),
+ "--add-reads", "m1=ALL-UNNAMED",
"-processor", ProcessorImpl.class.getName())
.outdir(classes)
.files(findJavaFiles(moduleSrc))
@@ -121,7 +120,7 @@
"package impl; public class Impl { api.Api api; }");
List<String> modLog = new JavacTask(tb)
- .options("-classpath", jar.toString(),
+ .options("--class-path", jar.toString(),
"-sourcepath", m1.toString(),
"-XDrawDiagnostics")
.outdir(classes)
@@ -154,7 +153,7 @@
"package impl; public class Impl { api.Api api; }");
new JavacTask(tb)
- .options("-classpath", jar.toString(),
+ .options("--class-path", jar.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(m1.resolve("module-info.java"))
@@ -163,7 +162,7 @@
.getOutputLines(Task.OutputKind.DIRECT);
List<String> modLog = new JavacTask(tb)
- .options("-classpath", jar.toString(),
+ .options("--class-path", jar.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(m1.resolve("impl").resolve("Impl.java"))