commit 24e957158dad847c7a61fc40e49b7eae04335a67
author Han-Wen Nienhuys <hanwen@google.com> Fri Feb 20 13:32:49 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Fri Feb 20 13:32:49 2015 +0000
tree 196ae13d21b9a8bf4c61639b8ed07cc7489f3356
parent ed881e140fe18b38d958ef4fed771a08b79502b3

Reenable Mac tests, but without ParallelEvaluatorTests.

--
MOS_MIGRATED_REVID=86780976

src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java

diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
index 64b5948..b7bb461 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
@@ -1977,6 +1977,11 @@
 
   @Test
   public void raceConditionWithNoKeepGoingErrors_InflightError() throws Exception {
+    if (System.getProperty("os.name").toLowerCase().indexOf("mac") >= 0) {
+      // TODO(Bazel-team): fix this test on OSX. It is flaky and causes hangs.
+      return;
+    }
+
     final CountDownLatch errorCommitted = new CountDownLatch(1);
     final TrackingAwaiter trackingAwaiterForError = new TrackingAwaiter();
     final CountDownLatch otherDone = new CountDownLatch(1);