From 8c784506aa3a0500722a8f1a469d97bb922fd5a9 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Thu, 18 Feb 2016 11:08:30 -0500
Subject: Disable the xctool updates

In light of https://github.com/google/protobuf/issues/1232, disable the xctool
update so we stay on 0.2.7 which seems to work better.

Remove the passing of -newSimulatorInstance since the older xctool doesn't
support it.
---
 .travis.yml |  3 ---
 travis.sh   | 13 ++++++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c0309fab..c5053df5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,8 +67,5 @@ matrix:
       env: CONFIG=ruby22
     - os: osx
       env: CONFIG=jruby
-    # Currently showing flake randomly, doesn't trace back to a single commit.
-    - os: osx
-      env: CONFIG=objectivec_ios
 notifications:
   email: false
diff --git a/travis.sh b/travis.sh
index c973ec6c..ff5e99d5 100755
--- a/travis.sh
+++ b/travis.sh
@@ -171,7 +171,13 @@ internal_objectivec_common () {
   #  http://docs.travis-ci.com/user/osx-ci-environment/
   # We don't use a before_install because we test multiple OSes.
   brew update
-  brew outdated xctool || brew upgrade xctool
+  # xctool 0.2.8 seems to have a bug where it randomly kills tests saying
+  # they failed. Disabling the updates, but letting it report about being
+  # updates as a hint that this needs to eventually get re-enabled.
+  #   https://github.com/facebook/xctool/issues/619
+  #   https://github.com/google/protobuf/issues/1232
+  brew outdated xctool || true
+  #brew outdated xctool || brew upgrade xctool
   # Reused the build script that takes care of configuring and ensuring things
   # are up to date. Xcode and conformance tests will be directly invoked.
   objectivec/DevTools/full_mac_build.sh \
@@ -202,15 +208,12 @@ build_objectivec_ios() {
     "platform=iOS Simulator,name=iPad Air,OS=9.2" # 64bit
   )
   for i in "${IOS_DESTINATIONS[@]}" ; do
-    # Throw -newSimulatorInstance in incase it helps with the flake that
-    # started happening after xctool 0.2.8 got released.
     internal_xctool_debug_and_release \
       -project objectivec/ProtocolBuffers_iOS.xcodeproj \
       -scheme ProtocolBuffers \
       -sdk iphonesimulator \
       -destination "${i}" \
-      run-tests \
-      -newSimulatorInstance
+      run-tests
   done
 }
 
-- 
cgit v1.2.3