test/tools/launcher/ExecutionEnvironment.java

@@ -283,12 +283,19 @@
         if (!isSolaris)
             return;
         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);
         System.err.println("verifying links in: " + bindir);
         File isaDir = new File(binDir, getArch()).getAbsoluteFile();