From f2de6feb26705f2be080d264f1237d0b033db22f Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 17 Sep 2020 04:29:31 -0700 Subject: [PATCH] 8253285: Some java/util/StringJoiner tests do not explicitly specify required -XX:+CompactStrings Signed-off-by: Andrew Leonard --- test/jdk/java/util/StringJoiner/MergeTest.java | 4 ++-- test/jdk/java/util/StringJoiner/StringJoinerTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/jdk/java/util/StringJoiner/MergeTest.java b/test/jdk/java/util/StringJoiner/MergeTest.java index 181a25d44470c..a251196101618 100644 --- a/test/jdk/java/util/StringJoiner/MergeTest.java +++ b/test/jdk/java/util/StringJoiner/MergeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary test StringJoiner::merge * @modules java.base/jdk.internal.util * @requires os.maxMemory > 4G - * @run testng/othervm -Xmx4g MergeTest + * @run testng/othervm -Xmx4g -XX:+CompactStrings MergeTest */ import java.util.StringJoiner; diff --git a/test/jdk/java/util/StringJoiner/StringJoinerTest.java b/test/jdk/java/util/StringJoiner/StringJoinerTest.java index 918823d23e9a6..f40179f3057a8 100644 --- a/test/jdk/java/util/StringJoiner/StringJoinerTest.java +++ b/test/jdk/java/util/StringJoiner/StringJoinerTest.java @@ -26,7 +26,7 @@ * @summary tests StringJoinerTest * @modules java.base/jdk.internal.util * @requires os.maxMemory > 4G - * @run testng/othervm -Xmx4g StringJoinerTest + * @run testng/othervm -Xmx4g -XX:+CompactStrings StringJoinerTest * @author Jim Gish */ import java.util.ArrayList;