From 0ca9e9839a7a1f7a42d41790123b00676f6987c1 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Thu, 30 Sep 2021 13:16:53 -0700
Subject: [PATCH] Attempt to fix Ruby tests on Mac

---
 ruby/travis-test.sh | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/ruby/travis-test.sh b/ruby/travis-test.sh
index 965782a6158d..d44640971c50 100755
--- a/ruby/travis-test.sh
+++ b/ruby/travis-test.sh
@@ -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 && \
@@ -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
 }