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.151 by jsr166, Sat Oct 3 19:19:01 2015 UTC vs.
Revision 1.157 by jsr166, Sat Oct 3 22:20:05 2015 UTC

# Line 7 | Line 7
7   */
8  
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 + import static java.util.concurrent.TimeUnit.MINUTES;
11   import static java.util.concurrent.TimeUnit.NANOSECONDS;
12  
13   import java.io.ByteArrayInputStream;
# Line 187 | Line 188 | public class JSR166TestCase extends Test
188          return (regex == null) ? null : Pattern.compile(regex);
189      }
190  
191 +    static volatile TestCase currentTestCase;
192 +    static {
193 +        Runnable checkForWedgedTest = new Runnable() { public void run() {
194 +            // avoid spurious reports with enormous runsPerTest
195 +            final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
196 +            for (TestCase lastTestCase = currentTestCase;;) {
197 +                try { MINUTES.sleep(timeoutMinutes); }
198 +                catch (InterruptedException unexpected) { break; }
199 +                if (lastTestCase == currentTestCase) {
200 +                    System.err.println
201 +                        ("Looks like we're stuck running test: "
202 +                         + lastTestCase);
203 +                    dumpTestThreads();
204 +                }
205 +                lastTestCase = currentTestCase;
206 +            }}};
207 +        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
208 +        thread.setDaemon(true);
209 +        thread.start();
210 +    }
211 +
212      public void runBare() throws Throwable {
213 +        currentTestCase = this;
214          if (methodFilter == null
215              || methodFilter.matcher(toString()).find())
216              super.runBare();
# Line 461 | Line 484 | public class JSR166TestCase extends Test
484          } else {
485              return new TestSuite();
486          }
464 –
487      }
488  
489      // Delays for timing-dependent tests, in milliseconds.
# Line 519 | Line 541 | public class JSR166TestCase extends Test
541       * the same test have no effect.
542       */
543      public void threadRecordFailure(Throwable t) {
544 +        dumpTestThreads();
545          threadFailure.compareAndSet(null, t);
546      }
547  
# Line 529 | Line 552 | public class JSR166TestCase extends Test
552      void tearDownFail(String format, Object... args) {
553          String msg = toString() + ": " + String.format(format, args);
554          System.err.println(msg);
555 <        printAllStackTraces();
555 >        dumpTestThreads();
556          throw new AssertionFailedError(msg);
557      }
558  
# Line 598 | Line 621 | public class JSR166TestCase extends Test
621              fail(reason);
622          } catch (AssertionFailedError t) {
623              threadRecordFailure(t);
624 <            fail(reason);
624 >            throw t;
625          }
626      }
627  
# Line 797 | Line 820 | public class JSR166TestCase extends Test
820      }
821  
822      /**
823 <     * A debugging tool to print all stack traces, as jstack does.
823 >     * A debugging tool to print stack traces of most threads, as jstack does.
824       * Uninteresting threads are filtered out.
825       */
826 <    static void printAllStackTraces() {
826 >    static void dumpTestThreads() {
827          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
828          System.err.println("------ stacktrace dump start ------");
829          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
# Line 813 | Line 836 | public class JSR166TestCase extends Test
836              if ("Finalizer".equals(name)
837                  && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
838                  continue;
839 +            if ("checkForWedgedTest".equals(name))
840 +                continue;
841              System.err.print(info);
842          }
843          System.err.println("------ stacktrace dump end ------");

Diff Legend

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