Merge
authorjwilhelm
Thu, 13 Nov 2014 12:28:49 +0100
changeset 27743 27976836d1e1
parent 27740 cce1f2b78182 (current diff)
parent 27742 d224c016bbaf (diff)
child 27744 602796878bbd
Merge
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java	Thu Nov 13 08:02:38 2014 +0100
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java	Thu Nov 13 12:28:49 2014 +0100
@@ -128,8 +128,7 @@
      */
     private static final Pattern useGcPattern = Pattern.compile(
             "(?:\\-XX\\:[\\+\\-]Use.+GC)"
-            + "|(?:\\-Xconcgc)"
-            + "|(?:\\-Xincgc)");
+            + "|(?:\\-Xconcgc)");
     public static List<String> removeGcOpts(List<String> opts) {
         List<String> optsWithoutGC = new ArrayList<String>();
         for (String opt : opts) {