# HG changeset patch
# User stefank
# Date 1408362929 -7200
# Node ID c75f62affad89c1441c1357088c06bfa302156f9
# Parent  76e62811f63b50fef6b7719178a316fccddb49ee
8055111: [TESTBUG] jdk.testlibrary.Utils.removeGcOpts doesn't remove -Xconcgc
Reviewed-by: jmasa, brutisso, sla

diff -r 76e62811f63b -r c75f62affad8 jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java	Fri Aug 15 12:28:58 2014 +0200
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java	Mon Aug 18 13:55:29 2014 +0200
@@ -126,7 +126,10 @@
      * GC specified by the framework must first be removed.
      * @return A copy of given opts with all GC options removed.
      */
-    private static final Pattern useGcPattern = Pattern.compile("\\-XX\\:[\\+\\-]Use.+GC");
+    private static final Pattern useGcPattern = Pattern.compile(
+            "(?:\\-XX\\:[\\+\\-]Use.+GC)"
+            + "|(?:\\-Xconcgc)"
+            + "|(?:\\-Xincgc)");
     public static List<String> removeGcOpts(List<String> opts) {
         List<String> optsWithoutGC = new ArrayList<String>();
         for (String opt : opts) {