From 1745f7eae9bc206ffeb47d63dcdfa039ef3774e8 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Tue, 17 Nov 2015 10:18:49 -0500 Subject: Add support for the conformance test for objc when run on OS X --- travis.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'travis.sh') diff --git a/travis.sh b/travis.sh index 3b6ec336..459f83f5 100755 --- a/travis.sh +++ b/travis.sh @@ -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() { -- cgit v1.2.3