OpenJDK / jdk / jdk10
changeset 25990:1f781f80ea0a
Merge
| author | mullan |
|---|---|
| date | Mon, 18 Aug 2014 08:48:59 -0400 |
| parents | 6a57ce3f21f1 c75f62affad8 |
| children | e9b05e933ddd |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java Mon Aug 18 08:45:08 2014 -0400 +++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java Mon Aug 18 08:48:59 2014 -0400 @@ -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) {