Fix Ruby tests on Mac

It appears that this extra conditional in travis-test.sh is no longer
necessary, and in fact we need to avoid using a custom version of
OpenSSL since that is causing its own error.
pull/9021/head
Adam Cozzette 3 years ago
parent 0333cb77de
commit 55b0e11f52
  1. 15
      ruby/travis-test.sh

@ -18,7 +18,7 @@ test_version() {
rake gc_test && rake gc_test &&
cd ../conformance && make test_jruby && cd ../conformance && make test_jruby &&
cd ../ruby/compatibility_tests/v3.0.0 && ./test.sh" cd ../ruby/compatibility_tests/v3.0.0 && ./test.sh"
elif [ "$version" == "ruby-2.6.0" -o "$version" == "ruby-2.7.0" -o "$version" == "ruby-3.0.2" ] ; then else
bash --login -c \ bash --login -c \
"rvm install $version && rvm use $version && \ "rvm install $version && rvm use $version && \
which ruby && \ which ruby && \
@ -29,19 +29,6 @@ test_version() {
cd ../conformance && make ${RUBY_CONFORMANCE} && cd ../conformance && make ${RUBY_CONFORMANCE} &&
cd ../ruby/compatibility_tests/v3.0.0 && cd ../ruby/compatibility_tests/v3.0.0 &&
cp -R ../../lib lib && ./test.sh" cp -R ../../lib lib && ./test.sh"
else
# Recent versions of OSX have deprecated OpenSSL, so we have to explicitly
# provide a path to the OpenSSL directory installed via Homebrew.
bash --login -c \
"rvm install $version --with-openssl-dir=`brew --prefix openssl` && \
rvm use $version && \
which ruby && \
git clean -f && \
gem install bundler -v 1.17.3 && bundle && \
rake test &&
rake gc_test &&
cd ../conformance && make ${RUBY_CONFORMANCE} &&
cd ../ruby/compatibility_tests/v3.0.0 && ./test.sh"
fi fi
} }

Loading…
Cancel
Save