langtools/test/tools/javac/processing/model/testgetallmembers/Main.java
changeset 27579 d1a63c99cdd5
parent 27319 030080f03e4f
child 30730 d3ce7619db2c
--- a/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java	Tue Nov 18 15:25:18 2014 -0800
+++ b/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java	Wed Dec 03 14:25:46 2014 +0000
@@ -59,10 +59,6 @@
     static Elements elements;
 
     public static void main(String[] args) throws Exception {
-        if (haveAltRt()) {
-            System.out.println("Warning: alt-rt.jar detected, test skipped");
-            return;
-        }
         JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
         try (StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null)) {
             fm.setLocation(CLASS_PATH, Collections.<File>emptyList());
@@ -126,23 +122,4 @@
                 throw new AssertionError("Too few nested classes in PLATFORM_CLASS_PATH ;-)");
         }
     }
-    /*
-     * If -XX:+AggressiveOpts has been used to test, the option currently
-     * instructs the VM to prepend alt-rt.jar onto the bootclasspath. This
-     * overrides the default TreeMap implemation in rt.jar causing symbol
-     * resolution problems (caused by inconsistent inner class), although
-     * alt-rt.jar is being eliminated, we have this sanity check to detect this
-     * case and skip the test.
-     */
-    static boolean haveAltRt() {
-        String bootClassPath = System.getProperty("sun.boot.class.path");
-        for (String cp : bootClassPath.split(File.pathSeparator)) {
-            if (cp.endsWith("alt-rt.jar")) {
-                System.err.println("Warning: detected alt-rt.jar in "
-                        + "sun.boot.class.path");
-                return true;
-            }
-        }
-        return false;
-    }
 }