# HG changeset patch
# User jwilhelm
# Date 1415878129 -3600
# Node ID 27976836d1e19b87bea5c5b3ee71189f25107ae9
# Parent  cce1f2b781829347490ce558fe44e80788fd32e6# Parent  d224c016bbafed5f4f964dbcdaefcfaaf8b0f0a0
Merge

diff -r cce1f2b78182 -r 27976836d1e1 jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
--- 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) {