--- jsr166/src/test/tck/JSR166TestCase.java	2015/10/03 19:08:13	1.150
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/10/04 03:49:33	1.161
@@ -7,6 +7,7 @@
  */
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 import java.io.ByteArrayInputStream;
@@ -187,7 +188,29 @@ public class JSR166TestCase extends Test
         return (regex == null) ? null : Pattern.compile(regex);
     }
 
+    static volatile TestCase currentTestCase;
+    static {
+        Runnable checkForWedgedTest = new Runnable() { public void run() {
+            // avoid spurious reports with enormous runsPerTest
+            final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
+            for (TestCase lastTestCase = currentTestCase;;) {
+                try { MINUTES.sleep(timeoutMinutes); }
+                catch (InterruptedException unexpected) { break; }
+                if (lastTestCase == currentTestCase) {
+                    System.err.println
+                        ("Looks like we're stuck running test: "
+                         + lastTestCase);
+                    dumpTestThreads();
+                }
+                lastTestCase = currentTestCase;
+            }}};
+        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
+        thread.setDaemon(true);
+        thread.start();
+    }
+
     public void runBare() throws Throwable {
+        currentTestCase = this;
         if (methodFilter == null
             || methodFilter.matcher(toString()).find())
             super.runBare();
@@ -461,7 +484,6 @@ public class JSR166TestCase extends Test
         } else {
             return new TestSuite();
         }
-
     }
 
     // Delays for timing-dependent tests, in milliseconds.
@@ -519,6 +541,8 @@ public class JSR166TestCase extends Test
      * the same test have no effect.
      */
     public void threadRecordFailure(Throwable t) {
+        System.err.println(t);
+        dumpTestThreads();
         threadFailure.compareAndSet(null, t);
     }
 
@@ -529,7 +553,7 @@ public class JSR166TestCase extends Test
     void tearDownFail(String format, Object... args) {
         String msg = toString() + ": " + String.format(format, args);
         System.err.println(msg);
-        printAllStackTraces();
+        dumpTestThreads();
         throw new AssertionFailedError(msg);
     }
 
@@ -598,7 +622,7 @@ public class JSR166TestCase extends Test
             fail(reason);
         } catch (AssertionFailedError t) {
             threadRecordFailure(t);
-            fail(reason);
+            throw t;
         }
     }
 
@@ -746,26 +770,36 @@ public class JSR166TestCase extends Test
     /**
      * Allows use of try-with-resources with per-test thread pools.
      */
-    static class PoolCloser<T extends ExecutorService>
-            implements AutoCloseable {
-        public final T pool;
-        public PoolCloser(T pool) { this.pool = pool; }
+    class PoolCleaner implements AutoCloseable {
+        private final ExecutorService pool;
+        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
         public void close() { joinPool(pool); }
     }
 
+    PoolCleaner cleaner(ExecutorService pool) {
+        return new PoolCleaner(pool);
+    }
+
     /**
      * Waits out termination of a thread pool or fails doing so.
      */
-    static void joinPool(ExecutorService pool) {
+    void joinPool(ExecutorService pool) {
         try {
             pool.shutdown();
-            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
-                fail("ExecutorService " + pool +
-                     " did not terminate in a timely manner");
+            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
+                try {
+                    threadFail("ExecutorService " + pool +
+                               " did not terminate in a timely manner");
+                } finally {
+                    // last resort, for the benefit of subsequent tests
+                    pool.shutdownNow();
+                    pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
+                }
+            }
         } catch (SecurityException ok) {
             // Allowed in case test doesn't have privs
         } catch (InterruptedException fail) {
-            fail("Unexpected InterruptedException");
+            threadFail("Unexpected InterruptedException");
         }
     }
 
@@ -779,7 +813,7 @@ public class JSR166TestCase extends Test
      */
     void testInParallel(Action ... actions) {
         ExecutorService pool = Executors.newCachedThreadPool();
-        try {
+        try (PoolCleaner cleaner = cleaner(pool)) {
             ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
             for (final Action action : actions)
                 futures.add(pool.submit(new CheckedRunnable() {
@@ -792,16 +826,14 @@ public class JSR166TestCase extends Test
                 } catch (Exception ex) {
                     threadUnexpectedException(ex);
                 }
-        } finally {
-            joinPool(pool);
         }
     }
 
     /**
-     * A debugging tool to print all stack traces, as jstack does.
+     * A debugging tool to print stack traces of most threads, as jstack does.
      * Uninteresting threads are filtered out.
      */
-    static void printAllStackTraces() {
+    static void dumpTestThreads() {
         ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
         System.err.println("------ stacktrace dump start ------");
         for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
@@ -814,6 +846,8 @@ public class JSR166TestCase extends Test
             if ("Finalizer".equals(name)
                 && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
                 continue;
+            if ("checkForWedgedTest".equals(name))
+                continue;
             System.err.print(info);
         }
         System.err.println("------ stacktrace dump end ------");
@@ -836,7 +870,7 @@ public class JSR166TestCase extends Test
             delay(millis);
             assertTrue(thread.isAlive());
         } catch (InterruptedException fail) {
-            fail("Unexpected InterruptedException");
+            threadFail("Unexpected InterruptedException");
         }
     }
 
@@ -858,7 +892,7 @@ public class JSR166TestCase extends Test
             for (Thread thread : threads)
                 assertTrue(thread.isAlive());
         } catch (InterruptedException fail) {
-            fail("Unexpected InterruptedException");
+            threadFail("Unexpected InterruptedException");
         }
     }
 
@@ -1284,11 +1318,22 @@ public class JSR166TestCase extends Test
             }};
     }
 
-    public Runnable awaiter(final CountDownLatch latch) {
-        return new CheckedRunnable() {
-            public void realRun() throws InterruptedException {
-                await(latch);
-            }};
+    class LatchAwaiter extends CheckedRunnable {
+        final static int NEW = 0;
+        final static int RUNNING = 1;
+        final static int DONE = 2;
+        final CountDownLatch latch;
+        int state = NEW;
+        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
+        public void realRun() throws InterruptedException {
+            state = 1;
+            await(latch);
+            state = 2;
+        }
+    }
+    
+    public LatchAwaiter awaiter(CountDownLatch latch) {
+        return new LatchAwaiter(latch);
     }
 
     public void await(CountDownLatch latch) {