--- jsr166/src/test/tck/JSR166TestCase.java	2015/09/14 03:14:01	1.144
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/09/28 08:23:49	1.148
@@ -40,6 +40,7 @@ import java.util.concurrent.CyclicBarrie
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Future;
 import java.util.concurrent.RecursiveAction;
 import java.util.concurrent.RecursiveTask;
@@ -185,27 +186,31 @@ 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();
         }
     }
 
     protected void runTestProfiled() throws Throwable {
-        // Warmup run, notably to trigger all needed classloading.
-        super.runTest();
-        long t0 = System.nanoTime();
-        try {
+        for (int i = 0; i < 2; i++) {
+            long startTime = System.nanoTime();
             super.runTest();
-        } finally {
-            long elapsedMillis = millisElapsedSince(t0);
-            if (elapsedMillis >= profileThreshold)
+            long elapsedMillis = millisElapsedSince(startTime);
+            if (elapsedMillis < profileThreshold)
+                break;
+            // Never report first run of any test; treat it as a
+            // warmup run, notably to trigger all needed classloading,
+            if (i > 0)
                 System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
         }
     }
@@ -520,6 +525,13 @@ public class JSR166TestCase extends Test
         setDelays();
     }
 
+    void tearDownFail(String format, Object... args) {
+        String msg = toString() + ": " + String.format(format, args);
+        System.err.println(msg);
+        printAllStackTraces();
+        throw new AssertionFailedError(msg);
+    }
+
     /**
      * Extra checks that get done for all test cases.
      *
@@ -547,7 +559,7 @@ public class JSR166TestCase extends Test
         }
 
         if (Thread.interrupted())
-            throw new AssertionFailedError("interrupt status set in main thread");
+            tearDownFail("interrupt status set in main thread");
 
         checkForkJoinPoolThreadLeaks();
     }
@@ -556,7 +568,7 @@ public class JSR166TestCase extends Test
      * Finds missing try { ... } finally { joinPool(e); }
      */
     void checkForkJoinPoolThreadLeaks() throws InterruptedException {
-        Thread[] survivors = new Thread[5];
+        Thread[] survivors = new Thread[7];
         int count = Thread.enumerate(survivors);
         for (int i = 0; i < count; i++) {
             Thread thread = survivors[i];
@@ -564,12 +576,15 @@ public class JSR166TestCase extends Test
             if (name.startsWith("ForkJoinPool-")) {
                 // give thread some time to terminate
                 thread.join(LONG_DELAY_MS);
-                if (!thread.isAlive()) continue;
-                throw new AssertionFailedError
-                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
-                                   toString(), name));
+                if (thread.isAlive())
+                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
+                                 thread);
             }
         }
+
+        if (!ForkJoinPool.commonPool()
+            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
+            tearDownFail("ForkJoin common pool thread stuck");
     }
 
     /**
@@ -1239,6 +1254,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 {