1 files changed, 14 insertions, 3 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/AtomicMarkableReferenceTest.java b/jsr166-tests/src/test/java/jsr166/AtomicMarkableReferenceTest.java
index fd1f2f1f97..61b6b1ba2c 100644
--- a/jsr166-tests/src/test/java/jsr166/AtomicMarkableReferenceTest.java
+++ b/jsr166-tests/src/test/java/jsr166/AtomicMarkableReferenceTest.java
@@ -8,10 +8,21 @@
 
 package jsr166;
 
-import junit.framework.*;
 import java.util.concurrent.atomic.AtomicMarkableReference;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class AtomicMarkableReferenceTest extends JSR166TestCase {
+    // android-note: Removed because the CTS runner does a bad job of
+    // retrying tests that have suite() declarations.
+    //
+    // public static void main(String[] args) {
+    //     main(suite(), args);
+    // }
+    // public static Test suite() {
+    //     return new TestSuite(...);
+    // }
 
     /**
      * constructor initializes to given reference and mark
@@ -135,11 +146,11 @@ public class AtomicMarkableReferenceTest extends JSR166TestCase {
         assertFalse(ai.isMarked());
         assertFalse(mark[0]);
 
-        while (!ai.weakCompareAndSet(one, two, false, false));
+        do {} while (!ai.weakCompareAndSet(one, two, false, false));
         assertSame(two, ai.get(mark));
         assertFalse(mark[0]);
 
-        while (!ai.weakCompareAndSet(two, m3, false, true));
+        do {} while (!ai.weakCompareAndSet(two, m3, false, true));
         assertSame(m3, ai.get(mark));
         assertTrue(mark[0]);
     }