changeset 7224:1698cbc9fa21

8060116: After JDK-8047976 gc/g1/TestSummarizeRSetStatsThreads fails Summary: Also reviewed by: sangheon.kim@oracle.com Reviewed-by: brutisso
author mlarsson
date Tue, 14 Oct 2014 19:55:54 +0200
parents 6488854ccc01
children 91b0a91f2171
files test/gc/g1/TestSummarizeRSetStatsThreads.java
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/test/gc/g1/TestSummarizeRSetStatsThreads.java	Mon Oct 13 16:05:46 2014 +0200
+++ b/test/gc/g1/TestSummarizeRSetStatsThreads.java	Tue Oct 14 19:55:54 2014 +0200
@@ -53,8 +53,8 @@
 
     // a zero in refinement thread numbers indicates that the value in ParallelGCThreads should be used.
     // Additionally use at least one thread.
-    int expectedNumRefinementThreads = refinementThreads == 0 ? workerThreads : refinementThreads;
-    expectedNumRefinementThreads = Math.max(1, expectedNumRefinementThreads);
+    int expectedNumRefinementThreads = refinementThreads;
+
     // create the pattern made up of n copies of a floating point number pattern
     String numberPattern = String.format("%0" + expectedNumRefinementThreads + "d", 0)
       .replace("0", "\\s+\\d+\\.\\d+");
@@ -73,9 +73,9 @@
       return;
     }
     // different valid combinations of number of refinement and gc worker threads
-    runTest(0, 0);
-    runTest(0, 5);
-    runTest(5, 0);
+    runTest(1, 1);
+    runTest(1, 5);
+    runTest(5, 1);
     runTest(10, 10);
     runTest(1, 2);
     runTest(4, 3);