From 56660de3c6df7a4ff8667ef4047d30d0de169935 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Sat, 1 Jun 2019 12:45:11 +0300
Subject: Merge rubygems master from upstream.

  I picked the commit from 3c469e0da538428a0ddd94f99aa73c32da22e8ba
---
 test/rubygems/test_gem_security.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'test/rubygems/test_gem_security.rb')

diff --git a/test/rubygems/test_gem_security.rb b/test/rubygems/test_gem_security.rb
index 1ba3fa7d9c..71185dc86e 100644
--- a/test/rubygems/test_gem_security.rb
+++ b/test/rubygems/test_gem_security.rb
@@ -6,6 +6,10 @@ unless defined?(OpenSSL::SSL)
   warn 'Skipping Gem::Security tests.  openssl not found.'
 end
 
+if Gem.java_platform?
+  warn 'Skipping Gem::Security tests on jruby.'
+end
+
 class TestGemSecurity < Gem::TestCase
 
   CHILD_KEY = load_key 'child'
@@ -307,4 +311,4 @@ class TestGemSecurity < Gem::TestCase
     assert_equal key.to_pem, key_from_file.to_pem
   end
 
-end if defined?(OpenSSL::SSL)
+end if defined?(OpenSSL::SSL) && !Gem.java_platform?
-- 
cgit v1.2.3