--- jsr166/src/test/tck/JSR166TestCase.java	2015/10/04 18:40:57	1.164
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/10/08 21:50:26	1.169
@@ -200,7 +200,11 @@ public class JSR166TestCase extends Test
                     System.err.println
                         ("Looks like we're stuck running test: "
                          + lastTestCase);
+                    System.err.println("availableProcessors=" +
+                        Runtime.getRuntime().availableProcessors());
                     dumpTestThreads();
+                    // one stack dump is probably enough; more would be spam
+                    break;
                 }
                 lastTestCase = currentTestCase;
             }}};
@@ -774,10 +778,43 @@ public class JSR166TestCase extends Test
         public void close() { joinPool(pool); }
     }
 
+    /**
+     * An extension of PoolCleaner that has an action to release the pool.
+     */
+    class PoolCleanerWithReleaser extends PoolCleaner {
+        private final Runnable releaser;
+        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
+            super(pool);
+            this.releaser = releaser;
+        }
+        public void close() {
+            try {
+                releaser.run();
+            } finally {
+                super.close();
+            }
+        }
+    }
+
     PoolCleaner cleaner(ExecutorService pool) {
         return new PoolCleaner(pool);
     }
 
+    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
+        return new PoolCleanerWithReleaser(pool, releaser);
+    }
+
+    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
+        return new PoolCleanerWithReleaser(pool, releaser(latch));
+    }
+
+    Runnable releaser(final CountDownLatch latch) {
+        return new Runnable() { public void run() {
+            do { latch.countDown(); }
+            while (latch.getCount() > 0);
+        }};
+    }
+
     /**
      * Waits out termination of a thread pool or fails doing so.
      */
@@ -791,7 +828,7 @@ public class JSR166TestCase extends Test
                 } finally {
                     // last resort, for the benefit of subsequent tests
                     pool.shutdownNow();
-                    pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
+                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
                 }
             }
         } catch (SecurityException ok) {
@@ -1168,7 +1205,7 @@ public class JSR166TestCase extends Test
         } finally {
             if (t.getState() != Thread.State.TERMINATED) {
                 t.interrupt();
-                fail("Test timed out");
+                threadFail("Test timed out");
             }
         }
     }