infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 14:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

6968434: test CheckResourceKeys fails on control builds

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2010-07-13 19:17:55 -07:00
parent ec05f75ccd
commit 5db54afdea
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
langtools/test/tools/javac/diags/CheckResourceKeys.java
View File

@ -294,6 +294,7 @@ public class CheckResourceKeys {
Set<String> results = new TreeSet<String>();
JavaCompiler c = ToolProvider.getSystemJavaCompiler();
JavaFileManager fm = c.getStandardFileManager(null, null, null);
JavaFileManager.Location javacLoc = findJavacLocation(fm);
String[] pkgs = {
"javax.annotation.processing",
"javax.lang.model",
@ -302,7 +303,7 @@ public class CheckResourceKeys {
"com.sun.tools.javac"
};
for (String pkg: pkgs) {
for (JavaFileObject fo: fm.list(StandardLocation.PLATFORM_CLASS_PATH,
for (JavaFileObject fo: fm.list(javacLoc,
pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) {
String name = fo.getName();
// ignore resource files, and files which are not really part of javac
@ -316,6 +317,23 @@ public class CheckResourceKeys {
return results;
}
// depending on how the test is run, javac may be on bootclasspath or classpath
JavaFileManager.Location findJavacLocation(JavaFileManager fm) {
JavaFileManager.Location[] locns =
{ StandardLocation.PLATFORM_CLASS_PATH, StandardLocation.CLASS_PATH };
try {
for (JavaFileManager.Location l: locns) {
JavaFileObject fo = fm.getJavaFileForInput(l,
"com.sun.tools.javac.Main", JavaFileObject.Kind.CLASS);
if (fo != null)
return l;
}
} catch (IOException e) {
throw new Error(e);
}
throw new IllegalStateException("Cannot find javac");
}
/**
* Get the set of strings from a class file.
* Only strings that look like they might be a resource key are returned.