--- jsr166/src/test/tck/JSR166TestCase.java	2015/10/05 21:39:39	1.166
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/10/08 21:50:26	1.169
@@ -200,6 +200,8 @@ public class JSR166TestCase extends Test
                     System.err.println
                         ("Looks like we're stuck running test: "
                          + lastTestCase);
+                    System.err.println("availableProcessors=" +
+                        Runtime.getRuntime().availableProcessors());
                     dumpTestThreads();
                     // one stack dump is probably enough; more would be spam
                     break;
@@ -826,7 +828,7 @@ public class JSR166TestCase extends Test
                 } finally {
                     // last resort, for the benefit of subsequent tests
                     pool.shutdownNow();
-                    pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
+                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
                 }
             }
         } catch (SecurityException ok) {
@@ -1203,7 +1205,7 @@ public class JSR166TestCase extends Test
         } finally {
             if (t.getState() != Thread.State.TERMINATED) {
                 t.interrupt();
-                fail("Test timed out");
+                threadFail("Test timed out");
             }
         }
     }