--- jsr166/src/test/tck/JSR166TestCase.java	2015/02/27 22:06:24	1.128
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/04/27 06:01:31	1.132
@@ -50,6 +50,7 @@ import java.util.regex.Pattern;
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestCase;
+import junit.framework.TestResult;
 import junit.framework.TestSuite;
 
 /**
@@ -160,6 +161,12 @@ public class JSR166TestCase extends Test
         Integer.getInteger("jsr166.runsPerTest", 1);
 
     /**
+     * The number of repetitions of the test suite (for finding leaks?).
+     */
+    private static final int suiteRuns =
+        Integer.getInteger("jsr166.suiteRuns", 1);
+
+    /**
      * A filter for tests to run, matching strings of the form
      * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
      * Usefully combined with jsr166.runsPerTest.
@@ -198,24 +205,28 @@ public class JSR166TestCase extends Test
 
     /**
      * Runs all JSR166 unit tests using junit.textui.TestRunner.
-     * Optional command line arg provides the number of iterations to
-     * repeat running the tests.
      */
     public static void main(String[] args) {
+        main(suite(), args);
+    }
+
+    /**
+     * Runs all unit tests in the given test suite.
+     * Actual behavior influenced by jsr166.* system properties.
+     */
+    static void main(Test suite, String[] args) {
         if (useSecurityManager) {
             System.err.println("Setting a permissive security manager");
             Policy.setPolicy(permissivePolicy());
             System.setSecurityManager(new SecurityManager());
         }
-        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
-
-        Test s = suite();
-        for (int i = 0; i < iters; ++i) {
-            junit.textui.TestRunner.run(s);
+        for (int i = 0; i < suiteRuns; i++) {
+            TestResult result = junit.textui.TestRunner.run(suite);
+            if (!result.wasSuccessful())
+                System.exit(1);
             System.gc();
             System.runFinalization();
         }
-        System.exit(0);
     }
 
     public static TestSuite newTestSuite(Object... suiteOrClasses) {
@@ -265,10 +276,7 @@ public class JSR166TestCase extends Test
     public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
     public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
     public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
-    public static boolean atLeastJava9() {
-        // As of 2014-05, java9 still uses 52.0 class file version
-        return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
-    }
+    public static boolean atLeastJava9() { return JAVA_CLASS_VERSION >= 53.0; }
 
     /**
      * Collects all JSR166 unit tests as one suite.
@@ -564,11 +572,11 @@ public class JSR166TestCase extends Test
     public void threadAssertEquals(Object x, Object y) {
         try {
             assertEquals(x, y);
-        } catch (AssertionFailedError t) {
-            threadRecordFailure(t);
-            throw t;
-        } catch (Throwable t) {
-            threadUnexpectedException(t);
+        } catch (AssertionFailedError fail) {
+            threadRecordFailure(fail);
+            throw fail;
+        } catch (Throwable fail) {
+            threadUnexpectedException(fail);
         }
     }
 
@@ -580,9 +588,9 @@ public class JSR166TestCase extends Test
     public void threadAssertSame(Object x, Object y) {
         try {
             assertSame(x, y);
-        } catch (AssertionFailedError t) {
-            threadRecordFailure(t);
-            throw t;
+        } catch (AssertionFailedError fail) {
+            threadRecordFailure(fail);
+            throw fail;
         }
     }