8227235: rare failures in testForkHelpQuiesce tck tests

Reviewed-by: martin, alanb
openjdk · Sep 14, 2019 · f634f77 · f634f77
1 parent 80fe274
commit f634f77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinTask8Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinTask8Test.java
@@ -559,6 +559,8 @@ protected void realCompute() {
                 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
@@ -526,6 +526,8 @@ protected void realCompute() {
                 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);