equal
deleted
inserted
replaced
152 "module m2 { requires m1; uses p.C; }"); |
152 "module m2 { requires m1; uses p.C; }"); |
153 Path modules = base.resolve("modules"); |
153 Path modules = base.resolve("modules"); |
154 Files.createDirectories(modules); |
154 Files.createDirectories(modules); |
155 |
155 |
156 new JavacTask(tb) |
156 new JavacTask(tb) |
157 .options("-modulesourcepath", src.toString()) |
157 .options("--module-source-path", src.toString()) |
158 .outdir(modules) |
158 .outdir(modules) |
159 .files(findJavaFiles(src)) |
159 .files(findJavaFiles(src)) |
160 .run(Task.Expect.SUCCESS) |
160 .run(Task.Expect.SUCCESS) |
161 .writeAll(); |
161 .writeAll(); |
162 } |
162 } |
173 .requires("m1") |
173 .requires("m1") |
174 .uses("p.C") |
174 .uses("p.C") |
175 .write(modSrc); |
175 .write(modSrc); |
176 |
176 |
177 new JavacTask(tb) |
177 new JavacTask(tb) |
178 .options("-mp", modules.toString()) |
178 .options("-p", modules.toString()) |
179 .outdir(modules) |
179 .outdir(modules) |
180 .files(findJavaFiles(modSrc.resolve("m2"))) |
180 .files(findJavaFiles(modSrc.resolve("m2"))) |
181 .run(Task.Expect.SUCCESS) |
181 .run(Task.Expect.SUCCESS) |
182 .writeAll(); |
182 .writeAll(); |
183 } |
183 } |
194 .requires("m1") |
194 .requires("m1") |
195 .uses("p.C.Inner") |
195 .uses("p.C.Inner") |
196 .write(modSrc); |
196 .write(modSrc); |
197 |
197 |
198 new JavacTask(tb) |
198 new JavacTask(tb) |
199 .options("-mp", modules.toString()) |
199 .options("-p", modules.toString()) |
200 .outdir(modules) |
200 .outdir(modules) |
201 .files(findJavaFiles(modSrc.resolve("m2"))) |
201 .files(findJavaFiles(modSrc.resolve("m2"))) |
202 .run(Task.Expect.SUCCESS) |
202 .run(Task.Expect.SUCCESS) |
203 .writeAll(); |
203 .writeAll(); |
204 } |
204 } |
253 "package p; public class C { }"); |
253 "package p; public class C { }"); |
254 tb.writeJavaFiles(src.resolve("m2"), |
254 tb.writeJavaFiles(src.resolve("m2"), |
255 "module m2 { requires m1; uses p.C; }"); |
255 "module m2 { requires m1; uses p.C; }"); |
256 |
256 |
257 List<String> output = new JavacTask(tb) |
257 List<String> output = new JavacTask(tb) |
258 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString()) |
258 .options("-XDrawDiagnostics", "--module-source-path", src.toString()) |
259 .outdir(Files.createDirectories(base.resolve("modules"))) |
259 .outdir(Files.createDirectories(base.resolve("modules"))) |
260 .files(findJavaFiles(src)) |
260 .files(findJavaFiles(src)) |
261 .run(Task.Expect.FAIL) |
261 .run(Task.Expect.FAIL) |
262 .writeAll() |
262 .writeAll() |
263 .getOutputLines(Task.OutputKind.DIRECT); |
263 .getOutputLines(Task.OutputKind.DIRECT); |
277 "package p; public class C { }"); |
277 "package p; public class C { }"); |
278 tb.writeJavaFiles(src.resolve("m2"), |
278 tb.writeJavaFiles(src.resolve("m2"), |
279 "module m2 { requires m1; uses p.C; }"); |
279 "module m2 { requires m1; uses p.C; }"); |
280 |
280 |
281 List<String> output = new JavacTask(tb) |
281 List<String> output = new JavacTask(tb) |
282 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString()) |
282 .options("-XDrawDiagnostics", "--module-source-path", src.toString()) |
283 .outdir(Files.createDirectories(base.resolve("modules"))) |
283 .outdir(Files.createDirectories(base.resolve("modules"))) |
284 .files(findJavaFiles(src)) |
284 .files(findJavaFiles(src)) |
285 .run(Task.Expect.FAIL) |
285 .run(Task.Expect.FAIL) |
286 .writeAll() |
286 .writeAll() |
287 .getOutputLines(Task.OutputKind.DIRECT); |
287 .getOutputLines(Task.OutputKind.DIRECT); |