1 files changed, 5 insertions, 0 deletions
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 64b5948cb7..b7bb461e53 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 @@ public class ParallelEvaluatorTest {
 
   @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);