From 8d47d7873e7cf332d30e7a661a4ec9cc4d794ad8 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Tue, 29 Mar 2016 09:21:50 -0400
Subject: Mark iOS tests as able to fail.

Travis updated their images to include an xctool that can randomly kill
tests, so mark them as flaky to avoid turning things red.
---
 .travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 9bc4d88f..60c0427d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,5 +71,14 @@ matrix:
     # we moved to an OS X image that is 10.11.
     - os: osx
       env: CONFIG=python_cpp
+    # xctool 0.2.8 seems to have a bug where it randomly kills tests saying
+    # they failed.
+    #   https://github.com/facebook/xctool/issues/619
+    #   https://github.com/google/protobuf/issues/1232
+    # travis updated their images to include 0.2.8:
+    #   https://blog.travis-ci.com/2016-03-23-xcode-image-updates
+    # Mark the iOS test as flakey so these failures don't turn things red.
+    - os: osx
+      env: CONFIG=objectivec_ios
 notifications:
   email: false
-- 
cgit v1.2.3