--- jsr166/src/test/tck/JSR166TestCase.java	2004/01/10 20:37:20	1.19
+++ jsr166/src/test/tck/JSR166TestCase.java	2005/03/31 15:24:29	1.26
@@ -94,8 +94,12 @@ public class JSR166TestCase extends Test
         if (args.length > 0) 
             iters = Integer.parseInt(args[0]);
         Test s = suite();
-        for (int i = 0; i < iters; ++i) 
+        for (int i = 0; i < iters; ++i) {
             junit.textui.TestRunner.run (s);
+            System.gc();
+            System.runFinalization();
+        }
+        System.exit(0);
     }
 
     /**
@@ -107,7 +111,9 @@ public class JSR166TestCase extends Test
         suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
         suite.addTest(new TestSuite(AbstractQueueTest.class));
         suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
+        suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
         suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
+        suite.addTest(new TestSuite(ArrayDequeTest.class));
         suite.addTest(new TestSuite(AtomicBooleanTest.class)); 
         suite.addTest(new TestSuite(AtomicIntegerArrayTest.class)); 
         suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class)); 
@@ -122,6 +128,10 @@ public class JSR166TestCase extends Test
         suite.addTest(new TestSuite(AtomicStampedReferenceTest.class)); 
         suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
         suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
+        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
+        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
+        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
+        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
         suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
         suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
         suite.addTest(new TestSuite(CountDownLatchTest.class));
@@ -131,6 +141,7 @@ public class JSR166TestCase extends Test
         suite.addTest(new TestSuite(ExecutorsTest.class));
         suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
         suite.addTest(new TestSuite(FutureTaskTest.class));
+        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
         suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
         suite.addTest(new TestSuite(LinkedListTest.class));
         suite.addTest(new TestSuite(LockSupportTest.class));
@@ -146,6 +157,10 @@ public class JSR166TestCase extends Test
         suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
         suite.addTest(new TestSuite(ThreadTest.class));
         suite.addTest(new TestSuite(TimeUnitTest.class));
+        suite.addTest(new TestSuite(TreeMapTest.class));
+        suite.addTest(new TestSuite(TreeSetTest.class));
+        suite.addTest(new TestSuite(TreeSubMapTest.class));
+        suite.addTest(new TestSuite(TreeSubSetTest.class));
 		
         return suite;
     }
@@ -162,7 +177,7 @@ public class JSR166TestCase extends Test
      * be reimplemented to use for example a Property.
      */ 
     protected long getShortDelay() {
-        return 10;
+        return 50;
     }
 
 
@@ -283,6 +298,8 @@ public class JSR166TestCase extends Test
         try {
             exec.shutdown();
             assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
+        } catch(SecurityException ok) {
+            // Allowed in case test doesn't have privs
         } catch(InterruptedException ie) {
             fail("Unexpected exception");
         }