aboutsummaryrefslogtreecommitdiff
path: root/tests.sh
diff options
context:
space:
mode:
authorSergio Campamá <kaipi@google.com>2016-06-14 11:26:01 -0700
committerThomas Van Lenten <thomasvl@google.com>2016-06-14 14:26:01 -0400
commitf0c1492ef6a6ad17ef62d49cd671980742729783 (patch)
tree13589f1f72c5a333f4abc9269fbfb18f232f607e /tests.sh
parent71f4a9c6f35007609ef423ab643c05c1f88731ce (diff)
downloadprotobuf-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 'tests.sh')
-rwxr-xr-xtests.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests.sh b/tests.sh
index cde108fd..72465a7b 100755
--- a/tests.sh
+++ b/tests.sh
@@ -223,6 +223,17 @@ build_objectivec_osx() {
--core-only --skip-xcode-ios
}
+build_objectivec_cocoapods_integration() {
+ # First, load the RVM environment in bash, needed to update ruby.
+ source ~/.rvm/scripts/rvm
+ # Update ruby to 2.2.3 as the default one crashes with segmentation faults
+ # when using pod.
+ rvm use 2.2.3 --install --binary --fuzzy
+ # Update pod to the latest version.
+ gem install cocoapods --no-ri --no-rdoc
+ objectivec/Tests/CocoaPods/run_tests.sh
+}
+
build_python() {
internal_build_cpp
internal_install_python_deps
@@ -304,6 +315,7 @@ Usage: $0 { cpp |
objectivec_ios_debug |
objectivec_ios_release |
objectivec_osx |
+ objectivec_cocoapods_integration |
python |
python_cpp |
ruby19 |