diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2016-03-29 11:55:04 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2016-03-29 11:55:04 -0400 |
| commit | 261ee021f640ea6fe67aaf1f53e1518ed154cad0 (patch) | |
| tree | 9f26e926a40a04a1f74510f35b4e21ca04846e50 /travis.sh | |
| parent | 9240acd179708c3a2ab79508af6fd68efa6f883a (diff) | |
| parent | 8d47d7873e7cf332d30e7a661a4ec9cc4d794ad8 (diff) | |
| download | protobuf-261ee021f640ea6fe67aaf1f53e1518ed154cad0.tar.gz protobuf-261ee021f640ea6fe67aaf1f53e1518ed154cad0.tar.bz2 protobuf-261ee021f640ea6fe67aaf1f53e1518ed154cad0.zip | |
Merge pull request #1358 from thomasvl/travis_tweaks
Mark iOS tests as able to fail.
Diffstat (limited to 'travis.sh')
| -rwxr-xr-x | travis.sh | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -171,13 +171,7 @@ 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 - # 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 + 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 \ |