--- old/test/tools/launcher/ExecutionEnvironment.java Tue Sep 10 11:08:42 2013 +++ new/test/tools/launcher/ExecutionEnvironment.java Tue Sep 10 11:08:42 2013 @@ -285,8 +285,15 @@ verifySymLinks(JAVA_BIN); verifySymLinks(JAVA_JRE_BIN); } - // exclude non-consequential binaries or scripts co-packaged in install - private Pattern symlinkExcludes = Pattern.compile(".*jvisualvm.*"); + // exclude non-consequential binaries or scripts co-packaged in other + // build phases + private final String excludeRE = + ".*jvisualvm.*" + + "|.*javaws.*" + + "|.*ControlPanel.*" + + "|.*java-rmi.cgi" + + "|.*jcontrol.*"; + private final Pattern symlinkExcludes = Pattern.compile(excludeRE); private void verifySymLinks(String bindir) throws IOException { File binDir = new File(bindir);