Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis.
diff --git a/travis.sh b/travis.sh
index 8a3341e..c973ec6 100755
--- a/travis.sh
+++ b/travis.sh
@@ -179,8 +179,10 @@
}
internal_xctool_debug_and_release() {
- xctool -configuration Debug "$@"
- xctool -configuration Release "$@"
+ # Always use -reporter plain to avoid escape codes in output (makes travis
+ # logs easier to read).
+ xctool -reporter plain -configuration Debug "$@"
+ xctool -reporter plain -configuration Release "$@"
}
build_objectivec_ios() {
@@ -202,14 +204,11 @@
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}" \
- -reporter plain \
run-tests \
-newSimulatorInstance
done