--- jsr166/src/test/tck/JSR166TestCase.java	2015/09/13 16:28:14	1.143
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/09/25 05:41:29	1.145
@@ -198,14 +198,15 @@ public class JSR166TestCase extends Test
     }
 
     protected void runTestProfiled() throws Throwable {
-        // Warmup run, notably to trigger all needed classloading.
-        super.runTest();
-        long t0 = System.nanoTime();
-        try {
+        for (int i = 0; i < 2; i++) {
+            long startTime = System.nanoTime();
             super.runTest();
-        } finally {
-            long elapsedMillis = millisElapsedSince(t0);
-            if (elapsedMillis >= profileThreshold)
+            long elapsedMillis = millisElapsedSince(startTime);
+            if (elapsedMillis < profileThreshold)
+                break;
+            // Never report first run of any test; treat it as a
+            // warmup run, notably to trigger all needed classloading,
+            if (i > 0)
                 System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
         }
     }
@@ -1223,7 +1224,10 @@ public class JSR166TestCase extends Test
     public static final String TEST_STRING = "a test string";
 
     public static class StringTask implements Callable<String> {
-        public String call() { return TEST_STRING; }
+        final String value;
+        public StringTask() { this(TEST_STRING); }
+        public StringTask(String value) { this.value = value; }
+        public String call() { return value; }
     }
 
     public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {