diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2015-11-17 10:18:49 -0500 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2015-11-18 11:58:19 -0500 |
commit | 1745f7eae9bc206ffeb47d63dcdfa039ef3774e8 (patch) | |
tree | 94c3b61e4b025c453c949c45255c5681914c799b /travis.sh | |
parent | 8162451b727e5abd46ea934a81d44c6ff7e0963e (diff) | |
download | protobuf-1745f7eae9bc206ffeb47d63dcdfa039ef3774e8.tar.gz protobuf-1745f7eae9bc206ffeb47d63dcdfa039ef3774e8.tar.bz2 protobuf-1745f7eae9bc206ffeb47d63dcdfa039ef3774e8.zip |
Add support for the conformance test for objc when run on OS X
Diffstat (limited to 'travis.sh')
-rwxr-xr-x | travis.sh | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -136,8 +136,9 @@ internal_objectivec_common () { brew update brew outdated xctool || brew upgrade xctool # Reused the build script that takes care of configuring and ensuring things - # are up to date. - objectivec/DevTools/full_mac_build.sh --core-only --skip-xcode + # are up to date. Xcode and conformance tests will be directly invoked. + objectivec/DevTools/full_mac_build.sh \ + --core-only --skip-xcode --skip-objc-conformance } internal_xctool_debug_and_release() { @@ -178,6 +179,7 @@ build_objectivec_osx() { -scheme ProtocolBuffers \ -destination "platform=OS X,arch=x86_64" \ test + cd conformance && make test_objc && cd .. } build_python() { |