--- jsr166/src/test/tck/AtomicLongTest.java	2014/12/31 19:05:42	1.27
+++ jsr166/src/test/tck/AtomicLongTest.java	2016/06/17 19:00:48	1.32
@@ -13,7 +13,7 @@ import junit.framework.TestSuite;
 
 public class AtomicLongTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicLongTest.class);
@@ -104,10 +104,10 @@ public class AtomicLongTest extends JSR1
      */
     public void testWeakCompareAndSet() {
         AtomicLong ai = new AtomicLong(1);
-        while (!ai.weakCompareAndSet(1, 2));
-        while (!ai.weakCompareAndSet(2, -4));
+        do {} while (!ai.weakCompareAndSet(1, 2));
+        do {} while (!ai.weakCompareAndSet(2, -4));
         assertEquals(-4, ai.get());
-        while (!ai.weakCompareAndSet(-4, 7));
+        do {} while (!ai.weakCompareAndSet(-4, 7));
         assertEquals(7, ai.get());
     }