aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests.sh
diff options
context:
space:
mode:
authorGravatar Sergio Campama <kaipi@google.com>2016-12-09 11:26:11 -0500
committerGravatar Sergio Campama <kaipi@google.com>2016-12-09 11:26:11 -0500
commit1ac8944294217b48413987bdf7b3eafea3cc3130 (patch)
treeb5bdea1143a19a7b67dc9499e77c2585f1885cd1 /tests.sh
parente43f73e09906004a0ccd2644984dbbae07c595da (diff)
Reenable cocoapods objc test and remove unnecessary workaround for rvm
Diffstat (limited to 'tests.sh')
-rwxr-xr-xtests.sh9
1 files changed, 0 insertions, 9 deletions
diff --git a/tests.sh b/tests.sh
index d067f4ad..ce149bc9 100755
--- a/tests.sh
+++ b/tests.sh
@@ -275,15 +275,6 @@ build_objectivec_osx() {
}
build_objectivec_cocoapods_integration() {
- # First, load the RVM environment in bash, needed to update ruby.
- source ~/.rvm/scripts/rvm
- # Update rvm to the latest version. This is needed to solve
- # https://github.com/google/protobuf/issues/1786 and may not be needed in the
- # future when Travis updates the default version of rvm.
- rvm get head
- # 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