--- jsr166/src/test/tck/JSR166TestCase.java	2015/10/11 23:07:44	1.175
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/10/23 21:59:58	1.179
@@ -273,6 +273,34 @@ public class JSR166TestCase extends Test
         main(suite(), args);
     }
 
+    static class PithyResultPrinter extends junit.textui.ResultPrinter {
+        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
+        long runTime;
+        public void startTest(Test test) {}
+        protected void printHeader(long runTime) {
+            this.runTime = runTime; // defer printing for later
+        }
+        protected void printFooter(TestResult result) {
+            if (result.wasSuccessful()) {
+                getWriter().println("OK (" + result.runCount() + " tests)"
+                    + "  Time: " + elapsedTimeAsString(runTime));
+            } else {
+                getWriter().println("Time: " + elapsedTimeAsString(runTime));
+                super.printFooter(result);
+            }
+        }
+    }
+
+    /**
+     * Returns a TestRunner that doesn't bother with unnecessary
+     * fluff, like printing a "." for each test case.
+     */
+    static junit.textui.TestRunner newPithyTestRunner() {
+        junit.textui.TestRunner runner = new junit.textui.TestRunner();
+        runner.setPrinter(new PithyResultPrinter(System.out));
+        return runner;
+    }
+
     /**
      * Runs all unit tests in the given test suite.
      * Actual behavior influenced by jsr166.* system properties.
@@ -284,7 +312,7 @@ public class JSR166TestCase extends Test
             System.setSecurityManager(new SecurityManager());
         }
         for (int i = 0; i < suiteRuns; i++) {
-            TestResult result = junit.textui.TestRunner.run(suite);
+            TestResult result = newPithyTestRunner().doRun(suite);
             if (!result.wasSuccessful())
                 System.exit(1);
             System.gc();
@@ -1228,7 +1256,7 @@ public class JSR166TestCase extends Test
         } finally {
             if (t.getState() != Thread.State.TERMINATED) {
                 t.interrupt();
-                threadFail("Test timed out");
+                threadFail("timed out waiting for thread to terminate");
             }
         }
     }
@@ -1396,7 +1424,9 @@ public class JSR166TestCase extends Test
 
     public void await(CountDownLatch latch) {
         try {
-            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
+            if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
+                fail("timed out waiting for CountDownLatch for "
+                     + (LONG_DELAY_MS/1000) + " sec");
         } catch (Throwable fail) {
             threadUnexpectedException(fail);
         }
@@ -1404,7 +1434,9 @@ public class JSR166TestCase extends Test
 
     public void await(Semaphore semaphore) {
         try {
-            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
+            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
+                fail("timed out waiting for Semaphore for "
+                     + (LONG_DELAY_MS/1000) + " sec");
         } catch (Throwable fail) {
             threadUnexpectedException(fail);
         }