--- jsr166/src/test/tck/SubmissionPublisherTest.java	2018/01/07 22:59:18	1.26
+++ jsr166/src/test/tck/SubmissionPublisherTest.java	2021/01/26 13:33:06	1.31
@@ -334,9 +334,7 @@ public class SubmissionPublisherTest ext
         TestSubscriber s = new TestSubscriber();
         SubmissionPublisher<Integer> p = basicPublisher();
         s.throwOnCall = true;
-        try {
-            p.subscribe(s);
-        } catch (Exception ok) {}
+        p.subscribe(s);
         s.awaitError();
         assertEquals(0, s.nexts);
         assertEquals(1, s.errors);
@@ -657,7 +655,7 @@ public class SubmissionPublisherTest ext
         return false;
     }
 
-    static boolean reqHandle(AtomicInteger count, Subscriber s) {
+    static boolean reqHandle(AtomicInteger count, Subscriber<?> s) {
         count.getAndIncrement();
         ((TestSubscriber)s).sn.request(Long.MAX_VALUE);
         return true;
@@ -960,7 +958,7 @@ public class SubmissionPublisherTest ext
     public void testConsumeNPE() {
         SubmissionPublisher<Integer> p = basicPublisher();
         try {
-            CompletableFuture<Void> f = p.consume(null);
+            CompletableFuture<Void> unused = p.consume(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -986,7 +984,11 @@ public class SubmissionPublisherTest ext
      */
     public void testMissedSignal_8187947() throws Exception {
         if (!atLeastJava9()) return; // backport to jdk8 too hard
-        final int N = expensiveTests ? (1 << 20) : (1 << 10);
+        final int N =
+            ((ForkJoinPool.getCommonPoolParallelism() < 2) // JDK-8212899
+             ? (1 << 5)
+             : (1 << 10))
+            * (expensiveTests ? (1 << 10) : 1);
         final CountDownLatch finished = new CountDownLatch(1);
         final SubmissionPublisher<Boolean> pub = new SubmissionPublisher<>();
         class Sub implements Subscriber<Boolean> {
@@ -1004,7 +1006,9 @@ public class SubmissionPublisherTest ext
             public void onComplete() {}
         }
         pub.subscribe(new Sub());
-        CompletableFuture.runAsync(() -> pub.submit(Boolean.TRUE));
+        checkTimedGet(
+            CompletableFuture.runAsync(() -> pub.submit(Boolean.TRUE)),
+            null);
         await(finished);
     }
 }