# HG changeset patch
# User jwilhelm
# Date 1415026383 -3600
# Node ID d224c016bbafed5f4f964dbcdaefcfaaf8b0f0a0
# Parent  89b967c599ce0f126806b45673954abef82e3aee# Parent  3264b51f3c8be9c239d1e0d83df070de53d06867
Merge

diff -r 89b967c599ce -r d224c016bbaf jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java	Thu Oct 30 17:48:10 2014 -0700
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java	Mon Nov 03 15:53:03 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) {