diff options
author | Sergio Campamá <kaipi@google.com> | 2016-06-14 11:26:01 -0700 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2016-06-14 14:26:01 -0400 |
commit | f0c1492ef6a6ad17ef62d49cd671980742729783 (patch) | |
tree | 13589f1f72c5a333f4abc9269fbfb18f232f607e /objectivec/Tests | |
parent | 71f4a9c6f35007609ef423ab643c05c1f88731ce (diff) | |
download | protobuf-f0c1492ef6a6ad17ef62d49cd671980742729783.tar.gz protobuf-f0c1492ef6a6ad17ef62d49cd671980742729783.tar.bz2 protobuf-f0c1492ef6a6ad17ef62d49cd671980742729783.zip |
Add the CocoaPods integration tests to Travis.
Also hotwires updating ruby as CocoaPods was crashing within a support library.
Fixes #1619
Diffstat (limited to 'objectivec/Tests')
-rwxr-xr-x | objectivec/Tests/CocoaPods/run_tests.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/objectivec/Tests/CocoaPods/run_tests.sh b/objectivec/Tests/CocoaPods/run_tests.sh index edf0fe81..749f413c 100755 --- a/objectivec/Tests/CocoaPods/run_tests.sh +++ b/objectivec/Tests/CocoaPods/run_tests.sh @@ -119,9 +119,18 @@ do_test() { # Put the right Podfile in place. cp -f "Podfile-${TEST_MODE}" "Podfile" + xcodebuild_args=( "-workspace" "${TEST_NAME}.xcworkspace" "-scheme" "${TEST_NAME}" ) + + # For iOS, if the SDK is not provided it tries to use iphoneos, and the test + # fail on Travis since those machines don't have a Code Signing identity. + if [[ "${TEST_NAME}" == iOS* ]] ; then + xcodebuild_args+=( "-sdk" "iphonesimulator" "ONLY_ACTIVE_ARCH=NO" ) + fi + # Do the work! pod install --verbose - xcodebuild -workspace "${TEST_NAME}.xcworkspace" -scheme "${TEST_NAME}" build + + xcodebuild "${xcodebuild_args[@]}" build # Clear the hook and manually run cleanup. trap - EXIT |