Skip to content

Commit

Permalink
Attempt to fix Ruby tests on Mac
Browse files Browse the repository at this point in the history
  • Loading branch information
acozzette committed Sep 30, 2021
1 parent 0333cb7 commit 0ca9e98
Showing 1 changed file with 6 additions and 16 deletions.
22 changes: 6 additions & 16 deletions ruby/travis-test.sh
Expand Up @@ -18,8 +18,8 @@ test_version() {
rake gc_test &&
cd ../conformance && make test_jruby &&
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
bash --login -c \
else
if ! bash --login -c \
"rvm install $version && rvm use $version && \
which ruby && \
git clean -f && \
Expand All @@ -28,20 +28,10 @@ test_version() {
rake gc_test &&
cd ../conformance && make ${RUBY_CONFORMANCE} &&
cd ../ruby/compatibility_tests/v3.0.0 &&
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"
cp -R ../../lib lib && ./test.sh"; then
cat /Users/kbuilder/.rvm/log/*/make.log
exit 1
fi
fi
}

Expand Down

0 comments on commit 0ca9e98

Please sign in to comment.