From 1ac8944294217b48413987bdf7b3eafea3cc3130 Mon Sep 17 00:00:00 2001
From: Sergio Campama <kaipi@google.com>
Date: Fri, 9 Dec 2016 11:26:11 -0500
Subject: Reenable cocoapods objc test and remove unnecessary workaround for
 rvm

---
 tests.sh | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'tests.sh')

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
-- 
cgit v1.2.3