diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-02-16 16:03:17 -0500 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2016-02-16 16:03:17 -0500 |
commit | 7cf5b817cb38f96ee1c51e6c3b6f01e383370ebc (patch) | |
tree | 35c22c58b5a38c7de74a744b8971706f466438f9 | |
parent | ee819ea724026396ea33ba4e5d70c020b022731c (diff) | |
parent | efca368939143bd2af6f67af424b5704acfb6e4d (diff) | |
download | protobuf-7cf5b817cb38f96ee1c51e6c3b6f01e383370ebc.tar.gz protobuf-7cf5b817cb38f96ee1c51e6c3b6f01e383370ebc.tar.bz2 protobuf-7cf5b817cb38f96ee1c51e6c3b6f01e383370ebc.zip |
Merge pull request #1247 from thomasvl/xctool_plain_output
Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis.
-rwxr-xr-x | travis.sh | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -179,8 +179,10 @@ internal_objectivec_common () { } 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 @@ build_objectivec_ios() { 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 |