8055111: [TESTBUG] jdk.testlibrary.Utils.removeGcOpts doesn't remove -Xconcgc

Reviewed-by: jmasa, brutisso, sla
This commit is contained in:
Stefan Karlsson 2014-08-18 13:55:29 +02:00
parent 107a5ada42
commit 9190088eb2

View File

@ -126,7 +126,10 @@ public final class Utils {
* 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) {