--- jsr166/src/test/tck/ForkJoinTaskTest.java	2018/07/22 20:47:22	1.56
+++ jsr166/src/test/tck/ForkJoinTaskTest.java	2020/06/04 14:17:31	1.58
@@ -499,6 +499,8 @@ public class ForkJoinTaskTest extends JS
                 AsyncFib f = new AsyncFib(8);
                 assertSame(f, f.fork());
                 helpQuiesce();
+                while (!f.isDone()) // wait out race
+                    ;
                 assertEquals(21, f.number);
                 assertEquals(0, getQueuedTaskCount());
                 checkCompletedNormally(f);
@@ -1689,6 +1691,19 @@ public class ForkJoinTaskTest extends JS
             assertEquals(
                 identityString(task) + "[Wrapped task = " + c.toString() + "]",
                 task.toString());
+        }
+    }
+
+    /**
+     * adaptInterruptible(callable).toString() contains toString of wrapped task
+     */
+    public void testAdaptInterruptible_Callable_toString() {
+        if (testImplementationDetails) {
+            Callable<String> c = () -> "";
+            ForkJoinTask<String> task = ForkJoinTask.adaptInterruptible(c);
+            assertEquals(
+                identityString(task) + "[Wrapped task = " + c.toString() + "]",
+                task.toString());
         }
     }
 }