Index: third_party/protobuf/ruby/travis-test.sh |
diff --git a/third_party/protobuf/ruby/travis-test.sh b/third_party/protobuf/ruby/travis-test.sh |
index 930165e61bdfc73373e463cd578d5ca22358fab5..75db7d931f7f4627f4f6890c356cda4ee7a0f80b 100755 |
--- a/third_party/protobuf/ruby/travis-test.sh |
+++ b/third_party/protobuf/ruby/travis-test.sh |
@@ -5,19 +5,17 @@ set -e |
test_version() { |
version=$1 |
- if [ "$version" == "jruby-1.7" ] ; then |
+ if [ "$version" == "jruby" ] ; then |
# No conformance tests yet -- JRuby is too broken to run them. |
bash --login -c \ |
- "rvm install $version && rvm use $version && rvm get head && \ |
+ "rvm install $version && rvm use $version && \ |
which ruby && \ |
- git clean -f && \ |
gem install bundler && bundle && \ |
rake test" |
else |
bash --login -c \ |
"rvm install $version && rvm use $version && \ |
which ruby && \ |
- git clean -f && \ |
gem install bundler && bundle && \ |
rake test && |
cd ../conformance && make test_ruby" |