From 30e645b6b672673e28ae6cb24be92cc8de040554 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Tue, 16 Feb 2016 11:16:42 -0500
Subject: [PATCH] Tweak the xctool run for iOS tests to try and sort out flake

- Use the plain reporter for slightly more readable logs.
- Add -newSimulatorInstance to the run-tests to see if it helps with flake.
---
 travis.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/travis.sh b/travis.sh
index 13a109a61..8a3341eaa 100755
--- a/travis.sh
+++ b/travis.sh
@@ -200,12 +200,18 @@ 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.
+    # Use -reporter plain to avoid escape codes in output while sorting out
+    # flake that doesn't seem source related.
     internal_xctool_debug_and_release \
       -project objectivec/ProtocolBuffers_iOS.xcodeproj \
       -scheme ProtocolBuffers \
       -sdk iphonesimulator \
       -destination "${i}" \
-      run-tests
+      -reporter plain \
+      run-tests \
+      -newSimulatorInstance
   done
 }