summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-26 21:50:50 +0000
committerryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-26 21:50:50 +0000
commitf9835b4697e41689a8f683d365c1b948f1d0cea1 (patch)
treee1aca3944153c4c4f5bb60da25d475be9976e38c /lib
parent405acb0cdc46e1c0cc5b0d1a5b5f6c990cdb112c (diff)
merged 33082-33083 from trunk
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/minitest/autorun.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/minitest/autorun.rb b/lib/minitest/autorun.rb
index 3b6c2d49f1..443f2f61d4 100644
--- a/lib/minitest/autorun.rb
+++ b/lib/minitest/autorun.rb
@@ -4,6 +4,13 @@
# File a patch instead and assign it to Ryan Davis.
######################################################################
+begin
+ require 'rubygems'
+ gem 'minitest'
+rescue Gem::LoadError
+ # do nothing
+end
+
require 'minitest/unit'
require 'minitest/spec'
require 'minitest/mock'