equal
deleted
inserted
replaced
75 "package p2; public class C2 extends p1.C1 { }"); |
75 "package p2; public class C2 extends p1.C1 { }"); |
76 Path modules = base.resolve("modules"); |
76 Path modules = base.resolve("modules"); |
77 Files.createDirectories(modules); |
77 Files.createDirectories(modules); |
78 |
78 |
79 new JavacTask(tb) |
79 new JavacTask(tb) |
80 .options("-modulesourcepath", src.toString()) |
80 .options("--module-source-path", src.toString()) |
81 .outdir(modules) |
81 .outdir(modules) |
82 .files(findJavaFiles(src)) |
82 .files(findJavaFiles(src)) |
83 .run(Task.Expect.SUCCESS) |
83 .run(Task.Expect.SUCCESS) |
84 .writeAll(); |
84 .writeAll(); |
85 |
85 |
158 tb.writeJavaFiles(modules.resolve("L"), |
158 tb.writeJavaFiles(modules.resolve("L"), |
159 "module L { requires M; provides p.Service with p.Service; }"); |
159 "module L { requires M; provides p.Service with p.Service; }"); |
160 |
160 |
161 List<String> output = new JavacTask(tb) |
161 List<String> output = new JavacTask(tb) |
162 .options("-XDrawDiagnostics", |
162 .options("-XDrawDiagnostics", |
163 "-modulesourcepath", modules.toString()) |
163 "--module-source-path", modules.toString()) |
164 .outdir(Files.createDirectories(base.resolve("classes"))) |
164 .outdir(Files.createDirectories(base.resolve("classes"))) |
165 .files(findJavaFiles(modules)) |
165 .files(findJavaFiles(modules)) |
166 .run(Task.Expect.FAIL) |
166 .run(Task.Expect.FAIL) |
167 .writeAll() |
167 .writeAll() |
168 .getOutputLines(Task.OutputKind.DIRECT); |
168 .getOutputLines(Task.OutputKind.DIRECT); |