--- jsr166/src/test/tck/JSR166TestCase.java	2013/02/03 06:20:32	1.98
+++ jsr166/src/test/tck/JSR166TestCase.java	2013/08/16 07:07:01	1.112
@@ -128,11 +128,19 @@ public class JSR166TestCase extends Test
     private static final long profileThreshold =
         Long.getLong("jsr166.profileThreshold", 100);
 
+    /**
+     * The number of repetitions per test (for tickling rare bugs).
+     */
+    private static final int runsPerTest =
+        Integer.getInteger("jsr166.runsPerTest", 1);
+
     protected void runTest() throws Throwable {
-        if (profileTests)
-            runTestProfiled();
-        else
-            super.runTest();
+        for (int i = 0; i < runsPerTest; i++) {
+            if (profileTests)
+                runTestProfiled();
+            else
+                super.runTest();
+        }
     }
 
     protected void runTestProfiled() throws Throwable {
@@ -286,7 +294,18 @@ public class JSR166TestCase extends Test
         // Java8+ test classes
         if (atLeastJava8()) {
             String[] java8TestClassNames = {
+                "CompletableFutureTest",
+                "ConcurrentHashMap8Test",
+                "CountedCompleterTest",
+                "DoubleAccumulatorTest",
+                "DoubleAdderTest",
+                "ForkJoinPool8Test",
+                "ForkJoinTask8Test",
+                "LongAccumulatorTest",
+                "LongAdderTest",
+                "SplittableRandomTest",
                 "StampedLockTest",
+                "ThreadLocalRandom8Test",
             };
             addNamedTestClasses(suite, java8TestClassNames);
         }
@@ -294,13 +313,13 @@ public class JSR166TestCase extends Test
         return suite;
     }
 
+    // Delays for timing-dependent tests, in milliseconds.
 
     public static long SHORT_DELAY_MS;
     public static long SMALL_DELAY_MS;
     public static long MEDIUM_DELAY_MS;
     public static long LONG_DELAY_MS;
 
-
     /**
      * Returns the shortest timed delay. This could
      * be reimplemented to use for example a Property.
@@ -383,6 +402,29 @@ public class JSR166TestCase extends Test
 
         if (Thread.interrupted())
             throw new AssertionFailedError("interrupt status set in main thread");
+
+        checkForkJoinPoolThreadLeaks();
+    }
+
+    /**
+     * Find missing try { ... } finally { joinPool(e); }
+     */
+    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
+        Thread[] survivors = new Thread[5];
+        int count = Thread.enumerate(survivors);
+        for (int i = 0; i < count; i++) {
+            Thread thread = survivors[i];
+            String name = thread.getName();
+            if (name.startsWith("ForkJoinPool-")) {
+                // give thread some time to terminate
+                thread.join(LONG_DELAY_MS);
+                if (!thread.isAlive()) continue;
+                thread.stop();
+                throw new AssertionFailedError
+                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
+                                   toString(), name));
+            }
+        }
     }
 
     /**
@@ -670,7 +712,6 @@ public class JSR166TestCase extends Test
     public static final Integer m6  = new Integer(-6);
     public static final Integer m10 = new Integer(-10);
 
-
     /**
      * Runs Runnable r with a security policy that permits precisely
      * the specified permissions.  If there is no current security
@@ -1201,7 +1242,7 @@ public class JSR166TestCase extends Test
     public abstract class CheckedRecursiveAction extends RecursiveAction {
         protected abstract void realCompute() throws Throwable;
 
-        public final void compute() {
+        @Override protected final void compute() {
             try {
                 realCompute();
             } catch (Throwable t) {
@@ -1216,7 +1257,7 @@ public class JSR166TestCase extends Test
     public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
         protected abstract T realCompute() throws Throwable;
 
-        public final T compute() {
+        @Override protected final T compute() {
             try {
                 return realCompute();
             } catch (Throwable t) {
@@ -1317,4 +1358,25 @@ public class JSR166TestCase extends Test
             return null;
         }
     }
+
+    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
+                             Runnable... throwingActions) {
+        for (Runnable throwingAction : throwingActions) {
+            boolean threw = false;
+            try { throwingAction.run(); }
+            catch (Throwable t) {
+                threw = true;
+                if (!expectedExceptionClass.isInstance(t)) {
+                    AssertionFailedError afe =
+                        new AssertionFailedError
+                        ("Expected " + expectedExceptionClass.getName() +
+                         ", got " + t.getClass().getName());
+                    afe.initCause(t);
+                    threadUnexpectedException(afe);
+                }
+            }
+            if (!threw)
+                shouldThrow(expectedExceptionClass.getName());
+        }
+    }
 }