From cc02a4ab7b71215de89c6bcfddc2fb2ef6f587be Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 27 Jun 2014 06:32:59 +0000
Subject: [PATCH] * lib/rubygems/test_case.rb: rescue Gem::LoadError in
 Gem::TestCase.   because it's effected by removing minitest from stdlib.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                 | 5 +++++
 lib/rubygems/test_case.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aecb21a586..aef850636d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 27 15:20:12 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rubygems/test_case.rb: rescue Gem::LoadError in Gem::TestCase.
+	  because it's effected by removing minitest from stdlib.
+
 Fri Jun 27 12:29:37 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* lib/rubygems/specification.rb: fixed broken condition caused
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index 328731d4ea..74cb4c98d1 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -2,7 +2,7 @@
 
 begin
   gem 'minitest', '~> 4.0'
-rescue NoMethodError
+rescue NoMethodError, Gem::LoadError
   # for ruby tests
 end