diff -r 2986e7052952 -r a1dc543483fc test/tools/javac/diags/CheckResourceKeys.java --- a/test/tools/javac/diags/CheckResourceKeys.java Wed Nov 07 17:01:19 2012 -0800 +++ b/test/tools/javac/diags/CheckResourceKeys.java Wed Nov 07 17:20:12 2012 -0800 @@ -310,9 +310,8 @@ pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) { String name = fo.getName(); // ignore resource files, and files which are not really part of javac - if (name.matches(".*resources.[A-Za-z_0-9]+\\.class") - || name.endsWith("Launcher.class") - || name.endsWith("CreateSymbols.class")) + if (name.matches(".*resources.[A-Za-z_0-9]+\\.class.*") + || name.matches(".*CreateSymbols\\.class.*")) continue; scan(fo, results); }