OpenJDK / jdk / jdk10
changeset 25988:c75f62affad8
8055111: [TESTBUG] jdk.testlibrary.Utils.removeGcOpts doesn't remove -Xconcgc
Reviewed-by: jmasa, brutisso, sla
| author | stefank |
|---|---|
| date | Mon, 18 Aug 2014 13:55:29 +0200 |
| parents | 76e62811f63b |
| children | 1f781f80ea0a |
| files | jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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) {