RFR: JDK-8246697 - Test: StringJoinerTest and related MergeTest failing with OOM

[Jim Laskey]

Updated diff


diff -r 71ec718a0bd0 test/jdk/ProblemList.txt
--- a/test/jdk/ProblemList.txt	Fri Jun 05 11:46:58 2020 -0300
+++ b/test/jdk/ProblemList.txt	Fri Jun 05 15:18:36 2020 -0300
@@ -883,7 +883,6 @@
 # jdk_util
 
 java/util/ServiceLoader/ReloadTest.java                     8242935 generic-all
-java/util/StringJoiner/StringJoinerTest.java                8246697 generic-all
 
 ############################################################################
 
diff -r 71ec718a0bd0 test/jdk/java/util/StringJoiner/MergeTest.java
--- a/test/jdk/java/util/StringJoiner/MergeTest.java	Fri Jun 05 11:46:58 2020 -0300
+++ b/test/jdk/java/util/StringJoiner/MergeTest.java	Fri Jun 05 15:18:36 2020 -0300
@@ -26,7 +26,8 @@
  * @bug 8017231 8020977 8054221
  * @summary test  StringJoiner::merge
  * @modules java.base/jdk.internal.util
- * @run testng MergeTest
+ * @requires os.maxMemory > 4G
+ * @run testng/othervm -Xmx4g MergeTest
  */
 
 import java.util.StringJoiner;
diff -r 71ec718a0bd0 test/jdk/java/util/StringJoiner/StringJoinerTest.java
--- a/test/jdk/java/util/StringJoiner/StringJoinerTest.java	Fri Jun 05 11:46:58 2020 -0300
+++ b/test/jdk/java/util/StringJoiner/StringJoinerTest.java	Fri Jun 05 15:18:36 2020 -0300
@@ -25,7 +25,8 @@
  * @bug 5015163 7172553
  * @summary tests StringJoinerTest
  * @modules java.base/jdk.internal.util
- * @run testng StringJoinerTest
+ * @requires os.maxMemory > 4G
+ * @run testng/othervm -Xmx4g StringJoinerTest
  * @author Jim Gish
  */
 import java.util.ArrayList;


> On Jun 5, 2020, at 2:52 PM, Jim Laskey <james.laskey at oracle.com> wrote:
> 
> Thank you.
> 
>> On Jun 5, 2020, at 2:51 PM, Igor Ignatyev <igor.ignatyev at oracle.com> wrote:
>> 
>> Hi Jim,
>> 
>> I'd also recommend you to add `@requires os.maxMemory > 4G` so the tests don't get executed on hosts which don't have enough memory for requested heap size.
>> 
>> -- Igor
>> 
>>> On Jun 5, 2020, at 10:46 AM, Jim Laskey <james.laskey at oracle.com> wrote:
>>> 
>>> Followup: can I get a quick review for the following. Both tests were sensitive to heap size.
>>> 
>>> jbs: https://bugs.openjdk.java.net/browse/JDK-8246697
>>> 
>>> 
>>> diff -r 71ec718a0bd0 test/jdk/ProblemList.txt
>>> --- a/test/jdk/ProblemList.txt	Fri Jun 05 11:46:58 2020 -0300
>>> +++ b/test/jdk/ProblemList.txt	Fri Jun 05 14:38:35 2020 -0300
>>> @@ -883,7 +883,6 @@
>>> # jdk_util
>>> 
>>> java/util/ServiceLoader/ReloadTest.java                     8242935 generic-all
>>> -java/util/StringJoiner/StringJoinerTest.java                8246697 generic-all
>>> 
>>> ############################################################################
>>> 
>>> diff -r 71ec718a0bd0 test/jdk/java/util/StringJoiner/MergeTest.java
>>> --- a/test/jdk/java/util/StringJoiner/MergeTest.java	Fri Jun 05 11:46:58 2020 -0300
>>> +++ b/test/jdk/java/util/StringJoiner/MergeTest.java	Fri Jun 05 14:38:35 2020 -0300
>>> @@ -26,7 +26,7 @@
>>> * @bug 8017231 8020977 8054221
>>> * @summary test  StringJoiner::merge
>>> * @modules java.base/jdk.internal.util
>>> - * @run testng MergeTest
>>> + * @run testng/othervm -Xmx4g MergeTest
>>> */
>>> 
>>> import java.util.StringJoiner;
>>> diff -r 71ec718a0bd0 test/jdk/java/util/StringJoiner/StringJoinerTest.java
>>> --- a/test/jdk/java/util/StringJoiner/StringJoinerTest.java	Fri Jun 05 11:46:58 2020 -0300
>>> +++ b/test/jdk/java/util/StringJoiner/StringJoinerTest.java	Fri Jun 05 14:38:35 2020 -0300
>>> @@ -25,7 +25,7 @@
>>> * @bug 5015163 7172553
>>> * @summary tests StringJoinerTest
>>> * @modules java.base/jdk.internal.util
>>> - * @run testng StringJoinerTest
>>> + * @run testng/othervm -Xmx4g StringJoinerTest
>>> * @author Jim Gish
>>> */
>>> import java.util.ArrayList;
>>> 
>> 
>