--- jsr166/src/test/tck/AbstractQueuedLongSynchronizerTest.java	2015/02/22 04:34:44	1.32
+++ jsr166/src/test/tck/AbstractQueuedLongSynchronizerTest.java	2015/07/03 01:56:38	1.35
@@ -21,7 +21,7 @@ import junit.framework.TestSuite;
 
 public class AbstractQueuedLongSynchronizerTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AbstractQueuedLongSynchronizerTest.class);
@@ -94,7 +94,7 @@ public class AbstractQueuedLongSynchroni
         }
 
         public boolean tryReleaseShared(long ignore) {
-            setState(1 << 62);
+            setState(1L << 62);
             return true;
         }
     }
@@ -246,6 +246,7 @@ public class AbstractQueuedLongSynchroni
                 long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
                 long nanosRemaining = c.awaitNanos(nanosTimeout);
                 assertTrue(nanosRemaining <= 0);
+                assertTrue(nanosRemaining > -MILLISECONDS.toNanos(LONG_DELAY_MS));
                 break;
             case awaitUntil:
                 assertFalse(c.awaitUntil(delayedDate(timeoutMillis)));