ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/JSR166TestCase.java
(Generate patch)

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.172 by jsr166, Fri Oct 9 01:26:36 2015 UTC vs.
Revision 1.174 by jsr166, Fri Oct 9 19:09:59 2015 UTC

# Line 193 | Line 193 | public class JSR166TestCase extends Test
193  
194      // Instrumentation to debug very rare, but very annoying hung test runs.
195      static volatile TestCase currentTestCase;
196 <    static volatile int currentRun = 0;
196 >    // static volatile int currentRun = 0;
197      static {
198          Runnable checkForWedgedTest = new Runnable() { public void run() {
199 <            // avoid spurious reports with enormous runsPerTest
200 <            final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
199 >            // Avoid spurious reports with enormous runsPerTest.
200 >            // A single test case run should never take more than 1 second.
201 >            // But let's cap it at the high end too ...
202 >            final int timeoutMinutes =
203 >                Math.min(15, Math.max(runsPerTest / 60, 1));
204              for (TestCase lastTestCase = currentTestCase;;) {
205                  try { MINUTES.sleep(timeoutMinutes); }
206                  catch (InterruptedException unexpected) { break; }
207                  if (lastTestCase == currentTestCase) {
208                      System.err.printf(
209 <                        "Looks like we're stuck running test: %s (%d/%d)%n",
210 <                        lastTestCase, currentRun, runsPerTest);
209 >                        "Looks like we're stuck running test: %s%n",
210 >                        lastTestCase);
211 > //                     System.err.printf(
212 > //                         "Looks like we're stuck running test: %s (%d/%d)%n",
213 > //                         lastTestCase, currentRun, runsPerTest);
214                      System.err.println("availableProcessors=" +
215                          Runtime.getRuntime().availableProcessors());
216                      System.err.printf("cpu model = %s%n", cpuModel());
# Line 238 | Line 244 | public class JSR166TestCase extends Test
244  
245      protected void runTest() throws Throwable {
246          for (int i = 0; i < runsPerTest; i++) {
247 <            currentRun = i;
247 >            // currentRun = i;
248              if (profileTests)
249                  runTestProfiled();
250              else

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines