test/gc/g1/TestSummarizeRSetStatsThreads.java

rev 7187 : [mq]: 8060116

*** 51,62 ****
      // check output to contain the string "Concurrent RS threads times (s)" followed by
      // the correct number of values in the next line.
  
      // 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);
      // 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+");
      String pattern = "Concurrent RS threads times \\(s\\)$" + numberPattern + "$";
      Matcher m = Pattern.compile(pattern, Pattern.MULTILINE).matcher(output.getStdout());
--- 51,62 ----
      // check output to contain the string "Concurrent RS threads times (s)" followed by
      // the correct number of values in the next line.
  
      // a zero in refinement thread numbers indicates that the value in ParallelGCThreads should be used.
      // Additionally use at least one thread.
!     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+");
      String pattern = "Concurrent RS threads times \\(s\\)$" + numberPattern + "$";
      Matcher m = Pattern.compile(pattern, Pattern.MULTILINE).matcher(output.getStdout());
*** 71,83 ****
    public static void main(String[] args) throws Exception {
      if (!TestSummarizeRSetStatsTools.testingG1GC()) {
        return;
      }
      // different valid combinations of number of refinement and gc worker threads
!     runTest(0, 0);
!     runTest(0, 5);
!     runTest(5, 0);
      runTest(10, 10);
      runTest(1, 2);
      runTest(4, 3);
    }
  }
--- 71,83 ----
    public static void main(String[] args) throws Exception {
      if (!TestSummarizeRSetStatsTools.testingG1GC()) {
        return;
      }
      // different valid combinations of number of refinement and gc worker threads
!     runTest(1, 1);
!     runTest(1, 5);
!     runTest(5, 1);
      runTest(10, 10);
      runTest(1, 2);
      runTest(4, 3);
    }
  }