--- jsr166/src/test/tck/RecursiveTaskTest.java	2011/03/15 19:47:07	1.27
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2015/10/07 00:15:23	1.34
@@ -4,22 +4,23 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.util.HashSet;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
-import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.RecursiveTask;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import java.util.HashSet;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class RecursiveTaskTest extends JSR166TestCase {
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(RecursiveTaskTest.class);
@@ -40,15 +41,13 @@ public class RecursiveTaskTest extends J
     }
 
     private <T> T testInvokeOnPool(ForkJoinPool pool, RecursiveTask<T> a) {
-        try {
+        try (PoolCleaner cleaner = cleaner(pool)) {
             checkNotDone(a);
 
             T result = pool.invoke(a);
 
             checkCompletedNormally(a, result);
             return result;
-        } finally {
-            joinPool(pool);
         }
     }
 
@@ -319,7 +318,6 @@ public class RecursiveTaskTest extends J
         assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
-
     /**
      * helpQuiesce returns when tasks are complete.
      * getQueuedTaskCount returns 0 when quiescent
@@ -329,7 +327,9 @@ public class RecursiveTaskTest extends J
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 assertSame(f, f.fork());
-                f.helpQuiesce();
+                helpQuiesce();
+                while (!f.isDone()) // wait out race
+                    ;
                 assertEquals(0, getQueuedTaskCount());
                 checkCompletedNormally(f, 21);
                 return NoResult;
@@ -337,7 +337,6 @@ public class RecursiveTaskTest extends J
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
-
     /**
      * invoke task throws exception when task completes abnormally
      */
@@ -763,7 +762,6 @@ public class RecursiveTaskTest extends J
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
-
     /**
      * invokeAll(tasks) with any null task throws NPE
      */