author | mcimadamore |
Thu, 12 Apr 2018 13:55:20 +0100 | |
changeset 49580 | 62b908c9f0e6 |
parent 47216 | 71c04702a3d5 |
child 53878 | 4584d0331318 |
permissions | -rw-r--r-- |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
1 |
/* |
43267 | 2 |
* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
4 |
* |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
8 |
* |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
13 |
* accompanied this code). |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
14 |
* |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
18 |
* |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
21 |
* questions. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
22 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
23 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
24 |
import java.io.*; |
10454
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
25 |
import java.net.URL; |
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
26 |
import java.net.URLClassLoader; |
44576 | 27 |
import java.nio.file.Files; |
28 |
import java.nio.file.Path; |
|
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
29 |
import java.util.*; |
44576 | 30 |
import java.util.Map.Entry; |
31 |
import java.util.jar.JarFile; |
|
32 |
import java.util.jar.JarOutputStream; |
|
33 |
import java.util.logging.Level; |
|
34 |
import java.util.logging.Logger; |
|
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
35 |
import java.util.regex.*; |
44576 | 36 |
import java.util.stream.Collectors; |
37 |
import java.util.zip.ZipEntry; |
|
38 |
||
10454
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
39 |
import javax.annotation.processing.Processor; |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
40 |
import javax.tools.Diagnostic; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
41 |
import javax.tools.DiagnosticCollector; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
42 |
import javax.tools.JavaCompiler; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
43 |
import javax.tools.JavaCompiler.CompilationTask; |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
44 |
import javax.tools.JavaFileManager; |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
45 |
import javax.tools.JavaFileObject; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
46 |
import javax.tools.StandardJavaFileManager; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
47 |
import javax.tools.ToolProvider; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
48 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
49 |
// The following two classes are both used, but cannot be imported directly |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
50 |
// import com.sun.tools.javac.Main |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
51 |
// import com.sun.tools.javac.main.Main |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
52 |
|
10454
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
53 |
import com.sun.tools.javac.api.ClientCodeWrapper; |
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
54 |
import com.sun.tools.javac.file.JavacFileManager; |
10638
c8e9604cf151
7075721: javac should have public enum for exit codes
jjg
parents:
10454
diff
changeset
|
55 |
import com.sun.tools.javac.main.Main; |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
56 |
import com.sun.tools.javac.util.Context; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
57 |
import com.sun.tools.javac.util.JavacMessages; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
58 |
import com.sun.tools.javac.util.JCDiagnostic; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
59 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
60 |
/** |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
61 |
* Class to handle example code designed to illustrate javac diagnostic messages. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
62 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
63 |
class Example implements Comparable<Example> { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
64 |
/* Create an Example from the files found at path. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
65 |
* The head of the file, up to the first Java code, is scanned |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
66 |
* for information about the test, such as what resource keys it |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
67 |
* generates when run, what options are required to run it, and so on. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
68 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
69 |
Example(File file) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
70 |
this.file = file; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
71 |
declaredKeys = new TreeSet<String>(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
72 |
srcFiles = new ArrayList<File>(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
73 |
procFiles = new ArrayList<File>(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
74 |
srcPathFiles = new ArrayList<File>(); |
38519 | 75 |
moduleSourcePathFiles = new ArrayList<File>(); |
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
76 |
patchModulePathFiles = new ArrayList<File>(); |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
77 |
modulePathFiles = new ArrayList<File>(); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
78 |
classPathFiles = new ArrayList<File>(); |
38519 | 79 |
additionalFiles = new ArrayList<File>(); |
43267 | 80 |
nonEmptySrcFiles = new ArrayList<File>(); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
81 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
82 |
findFiles(file, srcFiles); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
83 |
for (File f: srcFiles) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
84 |
parse(f); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
85 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
86 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
87 |
if (infoFile == null) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
88 |
throw new Error("Example " + file + " has no info file"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
89 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
90 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
91 |
private void findFiles(File f, List<File> files) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
92 |
if (f.isDirectory()) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
93 |
for (File c: f.listFiles()) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
94 |
if (files == srcFiles && c.getName().equals("processors")) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
95 |
findFiles(c, procFiles); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
96 |
else if (files == srcFiles && c.getName().equals("sourcepath")) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
97 |
srcPathDir = c; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
98 |
findFiles(c, srcPathFiles); |
38519 | 99 |
} else if (files == srcFiles && c.getName().equals("modulesourcepath")) { |
100 |
moduleSourcePathDir = c; |
|
101 |
findFiles(c, moduleSourcePathFiles); |
|
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
102 |
} else if (files == srcFiles && c.getName().equals("patchmodule")) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
103 |
patchModulePathDir = c; |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
104 |
findFiles(c, patchModulePathFiles); |
38519 | 105 |
} else if (files == srcFiles && c.getName().equals("additional")) { |
106 |
additionalFilesDir = c; |
|
107 |
findFiles(c, additionalFiles); |
|
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
108 |
} else if (files == srcFiles && c.getName().equals("modulepath")) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
109 |
findFiles(c, modulePathFiles); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
110 |
} else if (files == srcFiles && c.getName().equals("classpath")) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
111 |
findFiles(c, classPathFiles); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
112 |
} else { |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
113 |
findFiles(c, files); |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
114 |
} |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
115 |
} |
38519 | 116 |
} else if (f.isFile()) { |
43267 | 117 |
if (f.getName().endsWith(".java")) { |
118 |
files.add(f); |
|
119 |
} else if (f.getName().equals("modulesourcepath")) { |
|
120 |
moduleSourcePathDir = f; |
|
121 |
} |
|
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
122 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
123 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
124 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
125 |
private void parse(File f) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
126 |
Pattern keyPat = Pattern.compile(" *// *key: *([^ ]+) *"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
127 |
Pattern optPat = Pattern.compile(" *// *options: *(.*)"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
128 |
Pattern runPat = Pattern.compile(" *// *run: *(.*)"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
129 |
Pattern javaPat = Pattern.compile(" *@?[A-Za-z].*"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
130 |
try { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
131 |
String[] lines = read(f).split("[\r\n]+"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
132 |
for (String line: lines) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
133 |
Matcher keyMatch = keyPat.matcher(line); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
134 |
if (keyMatch.matches()) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
135 |
foundInfo(f); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
136 |
declaredKeys.add(keyMatch.group(1)); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
137 |
continue; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
138 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
139 |
Matcher optMatch = optPat.matcher(line); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
140 |
if (optMatch.matches()) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
141 |
foundInfo(f); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
142 |
options = Arrays.asList(optMatch.group(1).trim().split(" +")); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
143 |
continue; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
144 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
145 |
Matcher runMatch = runPat.matcher(line); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
146 |
if (runMatch.matches()) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
147 |
foundInfo(f); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
148 |
runOpts = Arrays.asList(runMatch.group(1).trim().split(" +")); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
149 |
} |
43267 | 150 |
if (javaPat.matcher(line).matches()) { |
151 |
nonEmptySrcFiles.add(f); |
|
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
152 |
break; |
43267 | 153 |
} |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
154 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
155 |
} catch (IOException e) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
156 |
throw new Error(e); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
157 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
158 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
159 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
160 |
private void foundInfo(File file) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
161 |
if (infoFile != null && !infoFile.equals(file)) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
162 |
throw new Error("multiple info files found: " + infoFile + ", " + file); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
163 |
infoFile = file; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
164 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
165 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
166 |
String getName() { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
167 |
return file.getName(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
168 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
169 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
170 |
/** |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
171 |
* Get the set of resource keys that this test declares it will generate |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
172 |
* when it is run. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
173 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
174 |
Set<String> getDeclaredKeys() { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
175 |
return declaredKeys; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
176 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
177 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
178 |
/** |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
179 |
* Get the set of resource keys that this test generates when it is run. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
180 |
* The test will be run if it has not already been run. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
181 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
182 |
Set<String> getActualKeys() { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
183 |
if (actualKeys == null) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
184 |
actualKeys = run(false); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
185 |
return actualKeys; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
186 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
187 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
188 |
/** |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
189 |
* Run the test. Information in the test header is used to determine |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
190 |
* how to run the test. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
191 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
192 |
void run(PrintWriter out, boolean raw, boolean verbose) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
193 |
if (out == null) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
194 |
throw new NullPointerException(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
195 |
try { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
196 |
run(out, null, raw, verbose); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
197 |
} catch (IOException e) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
198 |
e.printStackTrace(out); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
199 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
200 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
201 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
202 |
Set<String> run(boolean verbose) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
203 |
Set<String> keys = new TreeSet<String>(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
204 |
try { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
205 |
run(null, keys, true, verbose); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
206 |
} catch (IOException e) { |
8226
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
207 |
e.printStackTrace(System.err); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
208 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
209 |
return keys; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
210 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
211 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
212 |
/** |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
213 |
* Run the test. Information in the test header is used to determine |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
214 |
* how to run the test. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
215 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
216 |
private void run(PrintWriter out, Set<String> keys, boolean raw, boolean verbose) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
217 |
throws IOException { |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
218 |
List<String> opts = new ArrayList<String>(); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
219 |
if (!modulePathFiles.isEmpty()) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
220 |
File modulepathDir = new File(tempDir, "modulepath"); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
221 |
modulepathDir.mkdirs(); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
222 |
clean(modulepathDir); |
44576 | 223 |
boolean hasModuleInfo = |
224 |
modulePathFiles.stream() |
|
225 |
.anyMatch(f -> f.getName().equalsIgnoreCase("module-info.java")); |
|
226 |
Path modulePath = new File(file, "modulepath").toPath().toAbsolutePath(); |
|
227 |
if (hasModuleInfo) { |
|
228 |
//ordinary modules |
|
229 |
List<String> sOpts = |
|
230 |
Arrays.asList("-d", modulepathDir.getPath(), |
|
231 |
"--module-source-path", modulePath.toString()); |
|
232 |
new Jsr199Compiler(verbose).run(null, null, false, sOpts, modulePathFiles); |
|
233 |
} else { |
|
234 |
//automatic modules: |
|
235 |
Map<String, List<Path>> module2Files = |
|
236 |
modulePathFiles.stream() |
|
237 |
.map(f -> f.toPath()) |
|
238 |
.collect(Collectors.groupingBy(p -> modulePath.relativize(p) |
|
239 |
.getName(0) |
|
240 |
.toString())); |
|
241 |
for (Entry<String, List<Path>> e : module2Files.entrySet()) { |
|
242 |
File scratchDir = new File(tempDir, "scratch"); |
|
243 |
scratchDir.mkdirs(); |
|
244 |
clean(scratchDir); |
|
245 |
List<String> sOpts = |
|
246 |
Arrays.asList("-d", scratchDir.getPath()); |
|
247 |
new Jsr199Compiler(verbose).run(null, |
|
248 |
null, |
|
249 |
false, |
|
250 |
sOpts, |
|
251 |
e.getValue().stream() |
|
252 |
.map(p -> p.toFile()) |
|
253 |
.collect(Collectors.toList())); |
|
254 |
try (JarOutputStream jarOut = |
|
255 |
new JarOutputStream(new FileOutputStream(new File(modulepathDir, e.getKey() + ".jar")))) { |
|
256 |
Files.find(scratchDir.toPath(), Integer.MAX_VALUE, (p, attr) -> attr.isRegularFile()) |
|
257 |
.forEach(p -> { |
|
258 |
try (InputStream in = Files.newInputStream(p)) { |
|
259 |
jarOut.putNextEntry(new ZipEntry(scratchDir.toPath() |
|
260 |
.relativize(p) |
|
261 |
.toString())); |
|
262 |
jarOut.write(in.readAllBytes()); |
|
263 |
} catch (IOException ex) { |
|
264 |
throw new IllegalStateException(ex); |
|
265 |
} |
|
266 |
}); |
|
267 |
} |
|
268 |
} |
|
269 |
} |
|
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
270 |
opts.add("--module-path"); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
271 |
opts.add(modulepathDir.getAbsolutePath()); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
272 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
273 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
274 |
if (!classPathFiles.isEmpty()) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
275 |
File classpathDir = new File(tempDir, "classpath"); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
276 |
classpathDir.mkdirs(); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
277 |
clean(classpathDir); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
278 |
List<String> sOpts = Arrays.asList("-d", classpathDir.getPath()); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
279 |
new Jsr199Compiler(verbose).run(null, null, false, sOpts, classPathFiles); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
280 |
opts.add("--class-path"); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
281 |
opts.add(classpathDir.getAbsolutePath()); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
282 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
283 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
284 |
File classesDir = new File(tempDir, "classes"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
285 |
classesDir.mkdirs(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
286 |
clean(classesDir); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
287 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
288 |
opts.add("-d"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
289 |
opts.add(classesDir.getPath()); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
290 |
if (options != null) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
291 |
opts.addAll(options); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
292 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
293 |
if (procFiles.size() > 0) { |
36526 | 294 |
List<String> pOpts = new ArrayList<>(Arrays.asList("-d", classesDir.getPath())); |
295 |
||
296 |
// hack to automatically add exports; a better solution would be to grep the |
|
297 |
// source for import statements or a magic comment |
|
298 |
for (File pf: procFiles) { |
|
299 |
if (pf.getName().equals("CreateBadClassFile.java")) { |
|
43258 | 300 |
pOpts.add("--add-modules=jdk.jdeps"); |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38519
diff
changeset
|
301 |
pOpts.add("--add-exports=jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED"); |
36526 | 302 |
} |
303 |
} |
|
304 |
||
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
305 |
new Jsr199Compiler(verbose).run(null, null, false, pOpts, procFiles); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
306 |
opts.add("-classpath"); // avoid using -processorpath for now |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
307 |
opts.add(classesDir.getPath()); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
308 |
createAnnotationServicesFile(classesDir, procFiles); |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
10638
diff
changeset
|
309 |
} else if (options != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
10638
diff
changeset
|
310 |
int i = options.indexOf("-processor"); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
10638
diff
changeset
|
311 |
// check for built-in anno-processor(s) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
10638
diff
changeset
|
312 |
if (i != -1 && options.get(i + 1).equals("DocCommentProcessor")) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
10638
diff
changeset
|
313 |
opts.add("-classpath"); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
10638
diff
changeset
|
314 |
opts.add(System.getProperty("test.classes")); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
10638
diff
changeset
|
315 |
} |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
316 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
317 |
|
38519 | 318 |
List<File> files = srcFiles; |
319 |
||
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
320 |
if (srcPathDir != null) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
321 |
opts.add("-sourcepath"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
322 |
opts.add(srcPathDir.getPath()); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
323 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
324 |
|
38519 | 325 |
if (moduleSourcePathDir != null) { |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
38519
diff
changeset
|
326 |
opts.add("--module-source-path"); |
38519 | 327 |
opts.add(moduleSourcePathDir.getPath()); |
43267 | 328 |
files = new ArrayList<>(); |
329 |
files.addAll(moduleSourcePathFiles); |
|
330 |
files.addAll(nonEmptySrcFiles); // srcFiles containing declarations |
|
38519 | 331 |
} |
332 |
||
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
333 |
if (patchModulePathDir != null) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
334 |
for (File mod : patchModulePathDir.listFiles()) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
335 |
opts.add("--patch-module"); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
336 |
opts.add(mod.getName() + "=" + mod.getPath()); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
337 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
338 |
files = new ArrayList<>(); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
339 |
files.addAll(patchModulePathFiles); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
340 |
files.addAll(nonEmptySrcFiles); // srcFiles containing declarations |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
341 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
342 |
|
38519 | 343 |
if (additionalFiles.size() > 0) { |
344 |
List<String> sOpts = Arrays.asList("-d", classesDir.getPath()); |
|
345 |
new Jsr199Compiler(verbose).run(null, null, false, sOpts, additionalFiles); |
|
346 |
} |
|
347 |
||
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
348 |
try { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
349 |
Compiler c = Compiler.getCompiler(runOpts, verbose); |
38519 | 350 |
c.run(out, keys, raw, opts, files); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
351 |
} catch (IllegalArgumentException e) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
352 |
if (out != null) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
353 |
out.println("Invalid value for run tag: " + runOpts); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
354 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
355 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
356 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
357 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
358 |
void createAnnotationServicesFile(File dir, List<File> procFiles) throws IOException { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
359 |
File servicesDir = new File(new File(dir, "META-INF"), "services"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
360 |
servicesDir.mkdirs(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
361 |
File annoServices = new File(servicesDir, Processor.class.getName()); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
362 |
Writer out = new FileWriter(annoServices); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
363 |
try { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
364 |
for (File f: procFiles) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
365 |
out.write(f.getName().toString().replace(".java", "")); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
366 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
367 |
} finally { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
368 |
out.close(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
369 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
370 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
371 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
372 |
@Override |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
373 |
public int compareTo(Example e) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
374 |
return file.compareTo(e.file); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
375 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
376 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
377 |
@Override |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
378 |
public String toString() { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
379 |
return file.getPath(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
380 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
381 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
382 |
/** |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
383 |
* Read the contents of a file. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
384 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
385 |
private String read(File f) throws IOException { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
386 |
byte[] bytes = new byte[(int) f.length()]; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
387 |
DataInputStream in = new DataInputStream(new FileInputStream(f)); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
388 |
try { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
389 |
in.readFully(bytes); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
390 |
} finally { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
391 |
in.close(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
392 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
393 |
return new String(bytes); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
394 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
395 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
396 |
/** |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
397 |
* Clean the contents of a directory. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
398 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
399 |
boolean clean(File dir) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
400 |
boolean ok = true; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
401 |
for (File f: dir.listFiles()) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
402 |
if (f.isDirectory()) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
403 |
ok &= clean(f); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
404 |
ok &= f.delete(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
405 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
406 |
return ok; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
407 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
408 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
409 |
File file; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
410 |
List<File> srcFiles; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
411 |
List<File> procFiles; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
412 |
File srcPathDir; |
38519 | 413 |
File moduleSourcePathDir; |
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
414 |
File patchModulePathDir; |
38519 | 415 |
File additionalFilesDir; |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
416 |
List<File> srcPathFiles; |
38519 | 417 |
List<File> moduleSourcePathFiles; |
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43267
diff
changeset
|
418 |
List<File> patchModulePathFiles; |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
419 |
List<File> modulePathFiles; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
41932
diff
changeset
|
420 |
List<File> classPathFiles; |
38519 | 421 |
List<File> additionalFiles; |
43267 | 422 |
List<File> nonEmptySrcFiles; |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
423 |
File infoFile; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
424 |
private List<String> runOpts; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
425 |
private List<String> options; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
426 |
private Set<String> actualKeys; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
427 |
private Set<String> declaredKeys; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
428 |
|
17798
abe47e71498b
7060779: test/tools/javac/diags/Example.java leaves directories in tempdir
vromero
parents:
14541
diff
changeset
|
429 |
static File tempDir = (System.getProperty("test.src") != null) ? |
abe47e71498b
7060779: test/tools/javac/diags/Example.java leaves directories in tempdir
vromero
parents:
14541
diff
changeset
|
430 |
new File(System.getProperty("user.dir")): |
abe47e71498b
7060779: test/tools/javac/diags/Example.java leaves directories in tempdir
vromero
parents:
14541
diff
changeset
|
431 |
new File(System.getProperty("java.io.tmpdir")); |
abe47e71498b
7060779: test/tools/javac/diags/Example.java leaves directories in tempdir
vromero
parents:
14541
diff
changeset
|
432 |
|
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
433 |
static void setTempDir(File tempDir) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
434 |
Example.tempDir = tempDir; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
435 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
436 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
437 |
abstract static class Compiler { |
8226
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
438 |
interface Factory { |
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
439 |
Compiler getCompiler(List<String> opts, boolean verbose); |
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
440 |
} |
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
441 |
|
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
442 |
static class DefaultFactory implements Factory { |
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
443 |
public Compiler getCompiler(List<String> opts, boolean verbose) { |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
444 |
String first; |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
445 |
String[] rest; |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
446 |
if (opts == null || opts.isEmpty()) { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
447 |
first = null; |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
448 |
rest = new String[0]; |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
449 |
} else { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
450 |
first = opts.get(0); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
451 |
rest = opts.subList(1, opts.size()).toArray(new String[opts.size() - 1]); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
452 |
} |
27852
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
453 |
// For more details on the different compilers, |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
454 |
// see their respective class doc comments. |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
455 |
// See also README.examples.txt in this directory. |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
456 |
if (first == null || first.equals("jsr199")) |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
457 |
return new Jsr199Compiler(verbose, rest); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
458 |
else if (first.equals("simple")) |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
459 |
return new SimpleCompiler(verbose); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
460 |
else if (first.equals("backdoor")) |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
461 |
return new BackdoorCompiler(verbose); |
27852
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
462 |
else if (first.equals("exec")) |
36526 | 463 |
return new ExecCompiler(verbose, rest); |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
464 |
else |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
465 |
throw new IllegalArgumentException(first); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
466 |
} |
8226
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
467 |
} |
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
468 |
|
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
469 |
static Factory factory; |
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
470 |
|
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
471 |
static Compiler getCompiler(List<String> opts, boolean verbose) { |
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
472 |
if (factory == null) |
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
473 |
factory = new DefaultFactory(); |
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
474 |
|
8c2fd7e7bcf3
7013272: Automatically generate info about how compiler resource keys are used
jjg
parents:
6710
diff
changeset
|
475 |
return factory.getCompiler(opts, verbose); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
476 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
477 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
478 |
protected Compiler(boolean verbose) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
479 |
this.verbose = verbose; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
480 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
481 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
482 |
abstract boolean run(PrintWriter out, Set<String> keys, boolean raw, |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
483 |
List<String> opts, List<File> files); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
484 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
485 |
void setSupportClassLoader(ClassLoader cl) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
486 |
loader = cl; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
487 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
488 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
489 |
protected void close(JavaFileManager fm) { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
490 |
try { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
491 |
fm.close(); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
492 |
} catch (IOException e) { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
493 |
throw new Error(e); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
494 |
} |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
495 |
} |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
496 |
|
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
497 |
protected ClassLoader loader; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
498 |
protected boolean verbose; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
499 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
500 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
501 |
/** |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
502 |
* Compile using the JSR 199 API. The diagnostics generated are |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
503 |
* scanned for resource keys. Not all diagnostic keys are generated |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
504 |
* via the JSR 199 API -- for example, rich diagnostics are not directly |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
505 |
* accessible, and some diagnostics generated by the file manager may |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
506 |
* not be generated (for example, the JSR 199 file manager does not see |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
507 |
* -Xlint:path). |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
508 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
509 |
static class Jsr199Compiler extends Compiler { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
510 |
List<String> fmOpts; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
511 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
512 |
Jsr199Compiler(boolean verbose, String... args) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
513 |
super(verbose); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
514 |
for (int i = 0; i < args.length; i++) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
515 |
String arg = args[i]; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
516 |
if (arg.equals("-filemanager") && (i + 1 < args.length)) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
517 |
fmOpts = Arrays.asList(args[++i].split(",")); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
518 |
} else |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
519 |
throw new IllegalArgumentException(arg); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
520 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
521 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
522 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
523 |
@Override |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
524 |
boolean run(PrintWriter out, Set<String> keys, boolean raw, List<String> opts, List<File> files) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
525 |
if (out != null && keys != null) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
526 |
throw new IllegalArgumentException(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
527 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
528 |
if (verbose) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
529 |
System.err.println("run_jsr199: " + opts + " " + files); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
530 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
531 |
DiagnosticCollector<JavaFileObject> dc = null; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
532 |
if (keys != null) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
533 |
dc = new DiagnosticCollector<JavaFileObject>(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
534 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
535 |
if (raw) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
536 |
List<String> newOpts = new ArrayList<String>(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
537 |
newOpts.add("-XDrawDiagnostics"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
538 |
newOpts.addAll(opts); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
539 |
opts = newOpts; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
540 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
541 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
542 |
JavaCompiler c = ToolProvider.getSystemJavaCompiler(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
543 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
544 |
StandardJavaFileManager fm = c.getStandardFileManager(dc, null, null); |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
545 |
try { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
546 |
if (fmOpts != null) |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
547 |
fm = new FileManager(fm, fmOpts); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
548 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
549 |
Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromFiles(files); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
550 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
551 |
CompilationTask t = c.getTask(out, fm, dc, opts, null, fos); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
552 |
Boolean ok = t.call(); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
553 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
554 |
if (keys != null) { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
555 |
for (Diagnostic<? extends JavaFileObject> d: dc.getDiagnostics()) { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
556 |
scanForKeys(unwrap(d), keys); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
557 |
} |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
558 |
} |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
559 |
|
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
560 |
return ok; |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
561 |
} finally { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
562 |
close(fm); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
563 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
564 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
565 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
566 |
/** |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
567 |
* Scan a diagnostic for resource keys. This will not detect additional |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
568 |
* sub diagnostics that might be generated by a rich diagnostic formatter. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
569 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
570 |
private static void scanForKeys(JCDiagnostic d, Set<String> keys) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
571 |
keys.add(d.getCode()); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
572 |
for (Object o: d.getArgs()) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
573 |
if (o instanceof JCDiagnostic) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
574 |
scanForKeys((JCDiagnostic) o, keys); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
575 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
576 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
577 |
for (JCDiagnostic sd: d.getSubdiagnostics()) |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6349
diff
changeset
|
578 |
scanForKeys(sd, keys); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
579 |
} |
10454
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
580 |
|
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
581 |
private JCDiagnostic unwrap(Diagnostic<? extends JavaFileObject> diagnostic) { |
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
582 |
if (diagnostic instanceof JCDiagnostic) |
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
583 |
return (JCDiagnostic) diagnostic; |
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
584 |
if (diagnostic instanceof ClientCodeWrapper.DiagnosticSourceUnwrapper) |
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
585 |
return ((ClientCodeWrapper.DiagnosticSourceUnwrapper)diagnostic).d; |
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
586 |
throw new IllegalArgumentException(); |
9d5584396849
7074416: Regression: JSR199: javac doesn't unwrap clientcodewrapper objects
jjg
parents:
8615
diff
changeset
|
587 |
} |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
588 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
589 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
590 |
/** |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
591 |
* Run the test using the standard simple entry point. |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
592 |
*/ |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
593 |
static class SimpleCompiler extends Compiler { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
594 |
SimpleCompiler(boolean verbose) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
595 |
super(verbose); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
596 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
597 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
598 |
@Override |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
599 |
boolean run(PrintWriter out, Set<String> keys, boolean raw, List<String> opts, List<File> files) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
600 |
if (out != null && keys != null) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
601 |
throw new IllegalArgumentException(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
602 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
603 |
if (verbose) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
604 |
System.err.println("run_simple: " + opts + " " + files); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
605 |
|
6349
f80dfbda8f27
6976833: options included twice in Example SimpleCompiler
jjg
parents:
6155
diff
changeset
|
606 |
List<String> args = new ArrayList<String>(); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
607 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
608 |
if (keys != null || raw) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
609 |
args.add("-XDrawDiagnostics"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
610 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
611 |
args.addAll(opts); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
612 |
for (File f: files) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
613 |
args.add(f.getPath()); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
614 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
615 |
StringWriter sw = null; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
616 |
PrintWriter pw; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
617 |
if (keys != null) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
618 |
sw = new StringWriter(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
619 |
pw = new PrintWriter(sw); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
620 |
} else |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
621 |
pw = out; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
622 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
623 |
int rc = com.sun.tools.javac.Main.compile(args.toArray(new String[args.size()]), pw); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
624 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
625 |
if (keys != null) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
626 |
pw.close(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
627 |
scanForKeys(sw.toString(), keys); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
628 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
629 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
630 |
return (rc == 0); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
631 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
632 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
633 |
private static void scanForKeys(String text, Set<String> keys) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
634 |
StringTokenizer st = new StringTokenizer(text, " ,\r\n():"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
635 |
while (st.hasMoreElements()) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
636 |
String t = st.nextToken(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
637 |
if (t.startsWith("compiler.")) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
638 |
keys.add(t); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
639 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
640 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
641 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
642 |
|
27852
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
643 |
/** |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
644 |
* Run the test in a separate process. |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
645 |
*/ |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
646 |
static class ExecCompiler extends Compiler { |
36526 | 647 |
List<String> vmOpts; |
648 |
||
649 |
ExecCompiler(boolean verbose, String... args) { |
|
27852
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
650 |
super(verbose); |
36526 | 651 |
vmOpts = Arrays.asList(args); |
27852
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
652 |
} |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
653 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
654 |
@Override |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
655 |
boolean run(PrintWriter out, Set<String> keys, boolean raw, List<String> opts, List<File> files) { |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
656 |
if (out != null && keys != null) |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
657 |
throw new IllegalArgumentException(); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
658 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
659 |
if (verbose) |
36526 | 660 |
System.err.println("run_exec: " + vmOpts + " " + opts + " " + files); |
27852
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
661 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
662 |
List<String> args = new ArrayList<String>(); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
663 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
664 |
File javaHome = new File(System.getProperty("java.home")); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
665 |
if (javaHome.getName().equals("jre")) |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
666 |
javaHome = javaHome.getParentFile(); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
667 |
File javaExe = new File(new File(javaHome, "bin"), "java"); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
668 |
args.add(javaExe.getPath()); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
669 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
670 |
File toolsJar = new File(new File(javaHome, "lib"), "tools.jar"); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
671 |
if (toolsJar.exists()) { |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
672 |
args.add("-classpath"); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
673 |
args.add(toolsJar.getPath()); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
674 |
} |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
675 |
|
36526 | 676 |
args.addAll(vmOpts); |
27852
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
677 |
addOpts(args, "test.vm.opts"); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
678 |
addOpts(args, "test.java.opts"); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
679 |
args.add(com.sun.tools.javac.Main.class.getName()); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
680 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
681 |
if (keys != null || raw) |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
682 |
args.add("-XDrawDiagnostics"); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
683 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
684 |
args.addAll(opts); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
685 |
for (File f: files) |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
686 |
args.add(f.getPath()); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
687 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
688 |
try { |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
689 |
ProcessBuilder pb = new ProcessBuilder(args); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
690 |
pb.redirectErrorStream(true); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
691 |
Process p = pb.start(); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
692 |
BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream())); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
693 |
String line; |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
694 |
while ((line = in.readLine()) != null) { |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
695 |
if (keys != null) |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
696 |
scanForKeys(line, keys); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
697 |
} |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
698 |
int rc = p.waitFor(); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
699 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
700 |
return (rc == 0); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
701 |
} catch (IOException | InterruptedException e) { |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
702 |
System.err.println("Exception execing javac" + e); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
703 |
System.err.println("Command line: " + opts); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
704 |
return false; |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
705 |
} |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
706 |
} |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
707 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
708 |
private static void scanForKeys(String text, Set<String> keys) { |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
709 |
StringTokenizer st = new StringTokenizer(text, " ,\r\n():"); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
710 |
while (st.hasMoreElements()) { |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
711 |
String t = st.nextToken(); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
712 |
if (t.startsWith("compiler.")) |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
713 |
keys.add(t); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
714 |
} |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
715 |
} |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
716 |
|
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
717 |
private static void addOpts(List<String> args, String propName) { |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
718 |
String propValue = System.getProperty(propName); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
719 |
if (propValue == null || propValue.isEmpty()) |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
720 |
return; |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
721 |
args.addAll(Arrays.asList(propValue.split(" +", 0))); |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
722 |
} |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
723 |
} |
2e6ad0e4fe20
8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents:
27388
diff
changeset
|
724 |
|
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
725 |
static class BackdoorCompiler extends Compiler { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
726 |
BackdoorCompiler(boolean verbose) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
727 |
super(verbose); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
728 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
729 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
730 |
@Override |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
731 |
boolean run(PrintWriter out, Set<String> keys, boolean raw, List<String> opts, List<File> files) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
732 |
if (out != null && keys != null) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
733 |
throw new IllegalArgumentException(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
734 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
735 |
if (verbose) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
736 |
System.err.println("run_simple: " + opts + " " + files); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
737 |
|
8615
11d80b55b0ed
7022310: test/tools/javac/diags/Example: args added twice
jjg
parents:
8614
diff
changeset
|
738 |
List<String> args = new ArrayList<String>(); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
739 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
740 |
if (out != null && raw) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
741 |
args.add("-XDrawDiagnostics"); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
742 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
743 |
args.addAll(opts); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
744 |
for (File f: files) |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
745 |
args.add(f.getPath()); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
746 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
747 |
StringWriter sw = null; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
748 |
PrintWriter pw; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
749 |
if (keys != null) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
750 |
sw = new StringWriter(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
751 |
pw = new PrintWriter(sw); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
752 |
} else |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
753 |
pw = out; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
754 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
755 |
Context c = new Context(); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
756 |
JavacFileManager.preRegister(c); // can't create it until Log has been set up |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
757 |
MessageTracker.preRegister(c, keys); |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
758 |
|
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
759 |
try { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
760 |
Main m = new Main("javac", pw); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
761 |
Main.Result rc = m.compile(args.toArray(new String[args.size()]), c); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
762 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
763 |
if (keys != null) { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
764 |
pw.close(); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
765 |
} |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
766 |
|
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
767 |
return rc.isOK(); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
768 |
} finally { |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
17798
diff
changeset
|
769 |
close(c.get(JavaFileManager.class)); |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
770 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
771 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
772 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
773 |
static class MessageTracker extends JavacMessages { |
6155
214f78bb8006
6972747: CheckExamples fail when assertions are enabled
mcimadamore
parents:
6149
diff
changeset
|
774 |
|
214f78bb8006
6972747: CheckExamples fail when assertions are enabled
mcimadamore
parents:
6149
diff
changeset
|
775 |
MessageTracker(Context context) { |
214f78bb8006
6972747: CheckExamples fail when assertions are enabled
mcimadamore
parents:
6149
diff
changeset
|
776 |
super(context); |
214f78bb8006
6972747: CheckExamples fail when assertions are enabled
mcimadamore
parents:
6149
diff
changeset
|
777 |
} |
214f78bb8006
6972747: CheckExamples fail when assertions are enabled
mcimadamore
parents:
6149
diff
changeset
|
778 |
|
8614 | 779 |
static void preRegister(Context c, final Set<String> keys) { |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
780 |
if (keys != null) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
781 |
c.put(JavacMessages.messagesKey, new Context.Factory<JavacMessages>() { |
8614 | 782 |
public JavacMessages make(Context c) { |
6155
214f78bb8006
6972747: CheckExamples fail when assertions are enabled
mcimadamore
parents:
6149
diff
changeset
|
783 |
return new MessageTracker(c) { |
6149
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
784 |
@Override |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
785 |
public String getLocalizedString(Locale l, String key, Object... args) { |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
786 |
keys.add(key); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
787 |
return super.getLocalizedString(l, key, args); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
788 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
789 |
}; |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
790 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
791 |
}); |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
792 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
793 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
794 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
795 |
|
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
796 |
} |
48de3564aa13
6968063: provide examples of code that generate diagnostics
jjg
parents:
diff
changeset
|
797 |
} |