--- jsr166/src/test/tck/JSR166TestCase.java	2015/09/25 23:32:15	1.146
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/10/03 16:57:25	1.149
@@ -186,15 +186,18 @@ public class JSR166TestCase extends Test
         return (regex == null) ? null : Pattern.compile(regex);
     }
 
-    protected void runTest() throws Throwable {
+    public void runBare() throws Throwable {
         if (methodFilter == null
-            || methodFilter.matcher(toString()).find()) {
-            for (int i = 0; i < runsPerTest; i++) {
-                if (profileTests)
-                    runTestProfiled();
-                else
-                    super.runTest();
-            }
+            || methodFilter.matcher(toString()).find())
+            super.runBare();
+    }
+
+    protected void runTest() throws Throwable {
+        for (int i = 0; i < runsPerTest; i++) {
+            if (profileTests)
+                runTestProfiled();
+            else
+                super.runTest();
         }
     }
 
@@ -740,9 +743,19 @@ 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; }
+        public void close() { joinPool(pool); }
+    }
+
+    /**
      * Waits out termination of a thread pool or fails doing so.
      */
-    void joinPool(ExecutorService pool) {
+    static void joinPool(ExecutorService pool) {
         try {
             pool.shutdown();
             if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
@@ -1251,6 +1264,13 @@ public class JSR166TestCase extends Test
             }};
     }
 
+    public Runnable countDowner(final CountDownLatch latch) {
+        return new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
+                latch.countDown();
+            }};
+    }
+
     public Runnable awaiter(final CountDownLatch latch) {
         return new CheckedRunnable() {
             public void realRun() throws InterruptedException {