# HG changeset patch
# User dl
# Parent  d201106dd0f5b73cee00213afb22382f8ee8e8cc
8227235: rare failures in testForkHelpQuiesce tck tests
Reviewed-by: martin, alanb

diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinTask8Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinTask8Test.java
--- a/test/jdk/java/util/concurrent/tck/ForkJoinTask8Test.java
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinTask8Test.java
@@ -559,6 +559,8 @@
                 AsyncFib f = new AsyncFib(8);
                 assertSame(f, f.fork());
                 helpQuiesce();
+                while (!f.isDone()) // wait out race
+                    ;
                 assertEquals(0, getQueuedTaskCount());
                 f.checkCompletedNormally();
             }};
diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java b/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java
--- a/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java
@@ -526,6 +526,8 @@
                 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);