equal
deleted
inserted
replaced
80 "package test; public class B { }"); |
80 "package test; public class B { }"); |
81 Path classes = base.resolve("classes"); |
81 Path classes = base.resolve("classes"); |
82 Files.createDirectories(classes); |
82 Files.createDirectories(classes); |
83 |
83 |
84 new JavacTask(tb) |
84 new JavacTask(tb) |
85 .options("-Werror", "-modulesourcepath", base.toString()) |
85 .options("-Werror", "--module-source-path", base.toString()) |
86 .outdir(classes) |
86 .outdir(classes) |
87 .files(findJavaFiles(base)) |
87 .files(findJavaFiles(base)) |
88 .run() |
88 .run() |
89 .writeAll(); |
89 .writeAll(); |
90 } |
90 } |
105 "package impl; public class Impl { }"); |
105 "package impl; public class Impl { }"); |
106 Path classes = base.resolve("classes"); |
106 Path classes = base.resolve("classes"); |
107 Files.createDirectories(classes); |
107 Files.createDirectories(classes); |
108 |
108 |
109 List<String> log = new JavacTask(tb) |
109 List<String> log = new JavacTask(tb) |
110 .options("-XDrawDiagnostics", "-modulesourcepath", base.toString()) |
110 .options("-XDrawDiagnostics", "--module-source-path", base.toString()) |
111 .outdir(classes) |
111 .outdir(classes) |
112 .files(findJavaFiles(base)) |
112 .files(findJavaFiles(base)) |
113 .run(Task.Expect.FAIL) |
113 .run(Task.Expect.FAIL) |
114 .writeAll() |
114 .writeAll() |
115 .getOutputLines(Task.OutputKind.DIRECT); |
115 .getOutputLines(Task.OutputKind.DIRECT); |
135 .requires("N") |
135 .requires("N") |
136 .classes("package pack; public class B { pack.A f; }") |
136 .classes("package pack; public class B { pack.A f; }") |
137 .write(modSrc); |
137 .write(modSrc); |
138 |
138 |
139 String log = new JavacTask(tb) |
139 String log = new JavacTask(tb) |
140 .options("-XDrawDiagnostics", "-mp", modules.toString()) |
140 .options("-XDrawDiagnostics", "-p", modules.toString()) |
141 .outdir(Files.createDirectories(base.resolve("classes"))) |
141 .outdir(Files.createDirectories(base.resolve("classes"))) |
142 .files(findJavaFiles(modSrc.resolve("M"))) |
142 .files(findJavaFiles(modSrc.resolve("M"))) |
143 .run(Task.Expect.FAIL) |
143 .run(Task.Expect.FAIL) |
144 .writeAll() |
144 .writeAll() |
145 .getOutput(Task.OutputKind.DIRECT); |
145 .getOutput(Task.OutputKind.DIRECT); |
160 .requires("N") |
160 .requires("N") |
161 .classes("package pack; public class C { publ.B b; }") |
161 .classes("package pack; public class C { publ.B b; }") |
162 .write(modSrc); |
162 .write(modSrc); |
163 |
163 |
164 String log = new JavacTask(tb) |
164 String log = new JavacTask(tb) |
165 .options("-XDrawDiagnostics", "-modulesourcepath", modSrc.toString()) |
165 .options("-XDrawDiagnostics", "--module-source-path", modSrc.toString()) |
166 .outdir(Files.createDirectories(base.resolve("classes"))) |
166 .outdir(Files.createDirectories(base.resolve("classes"))) |
167 .files(findJavaFiles(modSrc)) |
167 .files(findJavaFiles(modSrc)) |
168 .run(Task.Expect.SUCCESS) |
168 .run(Task.Expect.SUCCESS) |
169 .writeAll() |
169 .writeAll() |
170 .getOutput(Task.OutputKind.DIRECT); |
170 .getOutput(Task.OutputKind.DIRECT); |
187 .requires("N") |
187 .requires("N") |
188 .classes("package pack; public class C { publ.B b; }") |
188 .classes("package pack; public class C { publ.B b; }") |
189 .write(modSrc); |
189 .write(modSrc); |
190 |
190 |
191 String log = new JavacTask(tb) |
191 String log = new JavacTask(tb) |
192 .options("-XDrawDiagnostics", "-mp", modules.toString()) |
192 .options("-XDrawDiagnostics", "-p", modules.toString()) |
193 .outdir(Files.createDirectories(base.resolve("classes"))) |
193 .outdir(Files.createDirectories(base.resolve("classes"))) |
194 .files(findJavaFiles(modSrc.resolve("M"))) |
194 .files(findJavaFiles(modSrc.resolve("M"))) |
195 .run(Task.Expect.SUCCESS) |
195 .run(Task.Expect.SUCCESS) |
196 .writeAll() |
196 .writeAll() |
197 .getOutput(Task.OutputKind.DIRECT); |
197 .getOutput(Task.OutputKind.DIRECT); |
218 .requires("N") |
218 .requires("N") |
219 .classes("package pkg; public class C { pack.A a; pack.B b; }") |
219 .classes("package pkg; public class C { pack.A a; pack.B b; }") |
220 .write(modSrc); |
220 .write(modSrc); |
221 |
221 |
222 List<String> log = new JavacTask(tb) |
222 List<String> log = new JavacTask(tb) |
223 .options("-XDrawDiagnostics", "-mp", modules.toString()) |
223 .options("-XDrawDiagnostics", "-p", modules.toString()) |
224 .outdir(Files.createDirectories(base.resolve("classes"))) |
224 .outdir(Files.createDirectories(base.resolve("classes"))) |
225 .files(findJavaFiles(modSrc.resolve("K"))) |
225 .files(findJavaFiles(modSrc.resolve("K"))) |
226 .run(Task.Expect.FAIL) |
226 .run(Task.Expect.FAIL) |
227 .writeAll() |
227 .writeAll() |
228 .getOutputLines(Task.OutputKind.DIRECT); |
228 .getOutputLines(Task.OutputKind.DIRECT); |
250 moduleK.requires("M") |
250 moduleK.requires("M") |
251 .requires("N") |
251 .requires("N") |
252 .classes("package p; public class DependsOnN { boolean f = pkg.A.flagN; } ") |
252 .classes("package p; public class DependsOnN { boolean f = pkg.A.flagN; } ") |
253 .write(modSrc); |
253 .write(modSrc); |
254 new JavacTask(tb) |
254 new JavacTask(tb) |
255 .options("-modulesourcepath", modSrc.toString()) |
255 .options("--module-source-path", modSrc.toString()) |
256 .outdir(Files.createDirectories(base.resolve("classes"))) |
256 .outdir(Files.createDirectories(base.resolve("classes"))) |
257 .files(findJavaFiles(modSrc.resolve("K"))) |
257 .files(findJavaFiles(modSrc.resolve("K"))) |
258 .run(Task.Expect.SUCCESS) |
258 .run(Task.Expect.SUCCESS) |
259 .writeAll(); |
259 .writeAll(); |
260 |
260 |
263 .classes("package p; public class DependsOnM { boolean f = pkg.A.flagM; } ") |
263 .classes("package p; public class DependsOnM { boolean f = pkg.A.flagM; } ") |
264 .write(modSrc); |
264 .write(modSrc); |
265 |
265 |
266 List<String> output = new JavacTask(tb) |
266 List<String> output = new JavacTask(tb) |
267 .options("-XDrawDiagnostics", |
267 .options("-XDrawDiagnostics", |
268 "-modulesourcepath", modSrc.toString()) |
268 "--module-source-path", modSrc.toString()) |
269 .outdir(Files.createDirectories(base.resolve("classes"))) |
269 .outdir(Files.createDirectories(base.resolve("classes"))) |
270 .files(findJavaFiles(modSrc.resolve("K"))) |
270 .files(findJavaFiles(modSrc.resolve("K"))) |
271 .run(Task.Expect.FAIL) |
271 .run(Task.Expect.FAIL) |
272 .writeAll() |
272 .writeAll() |
273 .getOutputLines(Task.OutputKind.DIRECT); |
273 .getOutputLines(Task.OutputKind.DIRECT); |