OpenJDK / jdk / hs
changeset 27742:d224c016bbaf
Merge
author | jwilhelm |
---|---|
date | Mon, 03 Nov 2014 15:53:03 +0100 |
parents | 89b967c599ce 3264b51f3c8b |
children | 27976836d1e1 |
files | |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java Thu Oct 30 17:48:10 2014 -0700 +++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java Mon Nov 03 15:53:03 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) {