author | darcy |
Fri, 02 Feb 2018 10:29:25 -0800 | |
changeset 48723 | 6cb86bf0b51e |
parent 47216 | 71c04702a3d5 |
permissions | -rw-r--r-- |
44289
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
1 |
/* |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
2 |
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
4 |
* |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
8 |
* |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
13 |
* accompanied this code). |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
14 |
* |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
18 |
* |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
21 |
* questions. |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
22 |
*/ |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
23 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
24 |
/* |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
25 |
* @test |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
26 |
* @bug 8175057 |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
27 |
* @summary Verify that having module-info on patch path works correctly. |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
28 |
* @library /tools/lib |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
29 |
* @modules |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
30 |
* jdk.compiler/com.sun.tools.javac.api |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
31 |
* jdk.compiler/com.sun.tools.javac.code |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
32 |
* jdk.compiler/com.sun.tools.javac.main |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
33 |
* jdk.compiler/com.sun.tools.javac.processing |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
34 |
* jdk.compiler/com.sun.tools.javac.util |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
35 |
* @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask ModuleTestBase |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
36 |
* @run main ModuleInfoPatchPath |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
37 |
*/ |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
38 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
39 |
import java.nio.file.Files; |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
40 |
import java.nio.file.Path; |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
41 |
import java.util.List; |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
42 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
43 |
import toolbox.JavacTask; |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
44 |
import toolbox.Task.OutputKind; |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
45 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
46 |
public class ModuleInfoPatchPath extends ModuleTestBase { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
47 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
48 |
public static void main(String... args) throws Exception { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
49 |
new ModuleInfoPatchPath().runTests(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
50 |
} |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
51 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
52 |
@Test |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
53 |
public void testModuleInfoToModulePath(Path base) throws Exception { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
54 |
Path src = base.resolve("src"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
55 |
tb.writeJavaFiles(src, |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
56 |
"module m { exports api; }", |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
57 |
"package api; public class Api {}"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
58 |
Path patch = base.resolve("patch"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
59 |
tb.writeJavaFiles(patch, |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
60 |
"module m { requires java.compiler; exports api; }", |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
61 |
"package api; public class Api { public static javax.lang.model.element.Element element; }"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
62 |
Path classes = base.resolve("classes"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
63 |
Path mClasses = classes.resolve("m"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
64 |
tb.createDirectories(mClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
65 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
66 |
System.err.println("Building the vanilla module..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
67 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
68 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
69 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
70 |
.files(findJavaFiles(src)) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
71 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
72 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
73 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
74 |
Path test = base.resolve("test"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
75 |
tb.writeJavaFiles(test, |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
76 |
"module test { requires m; }", |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
77 |
"package test; public class Test { private void test() { api.Api.element = null; } }"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
78 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
79 |
Path testClasses = classes.resolve("test"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
80 |
tb.createDirectories(testClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
81 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
82 |
System.err.println("Building patched module..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
83 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
84 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
85 |
.options("--module-path", mClasses.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
86 |
"--patch-module", "m=" + patch.toString()) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
87 |
.outdir(testClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
88 |
.files(findJavaFiles(test)) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
89 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
90 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
91 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
92 |
Path patchClasses = classes.resolve("patch"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
93 |
tb.createDirectories(patchClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
94 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
95 |
System.err.println("Building patch..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
96 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
97 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
98 |
.outdir(patchClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
99 |
.files(findJavaFiles(patch)) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
100 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
101 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
102 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
103 |
tb.cleanDirectory(testClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
104 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
105 |
Files.delete(patch.resolve("module-info.java")); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
106 |
Files.copy(patchClasses.resolve("module-info.class"), patch.resolve("module-info.class")); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
107 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
108 |
System.err.println("Building patched module against binary patch..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
109 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
110 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
111 |
.options("--module-path", mClasses.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
112 |
"--patch-module", "m=" + patch.toString()) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
113 |
.outdir(testClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
114 |
.files(findJavaFiles(test)) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
115 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
116 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
117 |
} |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
118 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
119 |
@Test |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
120 |
public void testModuleInfoToSourcePath(Path base) throws Exception { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
121 |
Path src = base.resolve("src"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
122 |
tb.writeJavaFiles(src, |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
123 |
"module m { exports api; }", |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
124 |
"package api; public class Api {}", |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
125 |
"package test; public class Test { private void test() { api.Api.element = null; } }"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
126 |
Path patch = base.resolve("patch"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
127 |
tb.writeJavaFiles(patch, |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
128 |
"module m { requires java.compiler; exports api; }", |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
129 |
"package api; public class Api { public static javax.lang.model.element.Element element; }"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
130 |
Path classes = base.resolve("classes"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
131 |
Path mClasses = classes.resolve("m"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
132 |
tb.createDirectories(mClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
133 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
134 |
System.err.println("Building patched module against source patch..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
135 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
136 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
137 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
138 |
"-sourcepath", src.toString()) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
139 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
140 |
.files(findJavaFiles(src.resolve("test"))) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
141 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
142 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
143 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
144 |
//incremental compilation: |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
145 |
List<String> log; |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
146 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
147 |
System.err.println("Incremental building of patched module against source patch, no module-info..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
148 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
149 |
log = new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
150 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
151 |
"-sourcepath", src.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
152 |
"-verbose") |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
153 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
154 |
.files(findJavaFiles(src.resolve("test"))) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
155 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
156 |
.writeAll() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
157 |
.getOutputLines(OutputKind.DIRECT); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
158 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
159 |
if (log.stream().filter(line -> line.contains("[parsing started")).count() != 1) { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
160 |
throw new AssertionError("incorrect number of parsing events."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
161 |
} |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
162 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
163 |
System.err.println("Incremental building of patched module against source patch, with module-info..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
164 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
165 |
log = new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
166 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
167 |
"-sourcepath", src.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
168 |
"-verbose") |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
169 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
170 |
.files(findJavaFiles(patch.resolve("module-info.java"), src.resolve("test"))) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
171 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
172 |
.writeAll() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
173 |
.getOutputLines(OutputKind.DIRECT); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
174 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
175 |
if (log.stream().filter(line -> line.contains("[parsing started")).count() != 2) { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
176 |
throw new AssertionError("incorrect number of parsing events."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
177 |
} |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
178 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
179 |
tb.cleanDirectory(mClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
180 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
181 |
System.err.println("Building patched module against source patch with source patch on patch path..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
182 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
183 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
184 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
185 |
"-sourcepath", src.toString()) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
186 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
187 |
.files(findJavaFiles(src.resolve("test"), patch)) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
188 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
189 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
190 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
191 |
Path patchClasses = classes.resolve("patch"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
192 |
tb.createDirectories(patchClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
193 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
194 |
System.err.println("Building patch..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
195 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
196 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
197 |
.outdir(patchClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
198 |
.files(findJavaFiles(patch)) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
199 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
200 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
201 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
202 |
tb.cleanDirectory(mClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
203 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
204 |
Files.delete(patch.resolve("module-info.java")); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
205 |
Files.copy(patchClasses.resolve("module-info.class"), patch.resolve("module-info.class")); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
206 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
207 |
System.err.println("Building patched module against binary patch..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
208 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
209 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
210 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
211 |
"-sourcepath", src.toString()) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
212 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
213 |
.files(findJavaFiles(src.resolve("test"))) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
214 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
215 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
216 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
217 |
tb.cleanDirectory(mClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
218 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
219 |
System.err.println("Building patched module against binary patch with source patch on patch path..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
220 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
221 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
222 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
223 |
"-sourcepath", src.toString()) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
224 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
225 |
.files(findJavaFiles(src.resolve("test"), patch)) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
226 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
227 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
228 |
} |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
229 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
230 |
@Test |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
231 |
public void testModuleInfoToModuleSourcePath(Path base) throws Exception { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
232 |
Path src = base.resolve("src"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
233 |
Path m = src.resolve("m"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
234 |
tb.writeJavaFiles(m, |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
235 |
"module m { exports api; }", |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
236 |
"package api; public class Api {}", |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
237 |
"package test; public class Test { private void test() { api.Api.element = null; } }"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
238 |
Path patch = base.resolve("patch"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
239 |
tb.writeJavaFiles(patch, |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
240 |
"module m { requires java.compiler; exports api; }", |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
241 |
"package api; public class Api { public static javax.lang.model.element.Element element; }"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
242 |
Path classes = base.resolve("classes"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
243 |
Path mClasses = classes.resolve("m"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
244 |
tb.createDirectories(mClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
245 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
246 |
System.err.println("Building patched module against source patch..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
247 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
248 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
249 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
250 |
"--module-source-path", src.toString()) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
251 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
252 |
.files(findJavaFiles(m.resolve("test"))) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
253 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
254 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
255 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
256 |
//incremental compilation: |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
257 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
258 |
System.err.println("Incremental building of patched module against source patch..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
259 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
260 |
List<String> log = new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
261 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
262 |
"--module-source-path", src.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
263 |
"-verbose") |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
264 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
265 |
.files(findJavaFiles(m.resolve("test"))) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
266 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
267 |
.writeAll() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
268 |
.getOutputLines(OutputKind.DIRECT); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
269 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
270 |
if (log.stream().filter(line -> line.contains("[parsing started")).count() != 1) { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
271 |
throw new AssertionError("incorrect number of parsing events."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
272 |
} |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
273 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
274 |
tb.cleanDirectory(mClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
275 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
276 |
System.err.println("Building patched module against source patch with source patch on patch path..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
277 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
278 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
279 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
280 |
"--module-source-path", src.toString()) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
281 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
282 |
.files(findJavaFiles(m.resolve("test"), patch)) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
283 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
284 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
285 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
286 |
Path patchClasses = classes.resolve("patch"); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
287 |
tb.createDirectories(patchClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
288 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
289 |
System.err.println("Building patch..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
290 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
291 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
292 |
.outdir(patchClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
293 |
.files(findJavaFiles(patch)) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
294 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
295 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
296 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
297 |
tb.cleanDirectory(mClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
298 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
299 |
Files.delete(patch.resolve("module-info.java")); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
300 |
Files.copy(patchClasses.resolve("module-info.class"), patch.resolve("module-info.class")); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
301 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
302 |
System.err.println("Building patched module against binary patch..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
303 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
304 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
305 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
306 |
"--module-source-path", src.toString()) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
307 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
308 |
.files(findJavaFiles(m.resolve("test"))) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
309 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
310 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
311 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
312 |
tb.cleanDirectory(mClasses); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
313 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
314 |
System.err.println("Building patched module against binary patch with source patch on patch path..."); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
315 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
316 |
new JavacTask(tb) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
317 |
.options("--patch-module", "m=" + patch.toString(), |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
318 |
"--module-source-path", src.toString()) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
319 |
.outdir(mClasses) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
320 |
.files(findJavaFiles(m.resolve("test"), patch)) |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
321 |
.run() |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
322 |
.writeAll(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
323 |
} |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
324 |
|
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
diff
changeset
|
325 |
} |