nobu	2017-09-24 18:35:09 +0900 (Sun, 24 Sep 2017)

  New Revision: 60010

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60010

  Log:
    gem.rb: load rubygems.rb
    
    * test/rubygems/test_gem.rb: load rubygems.rb explicitly, for the
      case configured as --disable-rubygems.

  Modified files:
    trunk/test/rubygems/test_gem.rb
Index: test/rubygems/test_gem.rb
===================================================================
--- test/rubygems/test_gem.rb	(revision 60009)
+++ test/rubygems/test_gem.rb	(revision 60010)
@@ -1466,9 +1466,8 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1466
     ENV['RUBYGEMS_GEMDEPS'] = "-"
 
     path = File.join @tempdir, "gem.deps.rb"
-    cmd = [Gem.ruby.dup.untaint, "-I#{LIB_PATH.untaint}"]
+    cmd = [Gem.ruby.dup.untaint, "-I#{LIB_PATH.untaint}", "-rrubygems"]
     if RUBY_VERSION < '1.9'
-      cmd << "-rubygems"
       cmd << "-e 'puts Gem.loaded_specs.values.map(&:full_name).sort'"
       cmd = cmd.join(' ')
     else
@@ -1509,9 +1508,8 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1508
     Dir.mkdir "sub1"
 
     path = File.join @tempdir, "gem.deps.rb"
-    cmd = [Gem.ruby.dup.untaint, "-Csub1", "-I#{LIB_PATH.untaint}"]
+    cmd = [Gem.ruby.dup.untaint, "-Csub1", "-I#{LIB_PATH.untaint}", "-rrubygems"]
     if RUBY_VERSION < '1.9'
-      cmd << "-rubygems"
       cmd << "-e 'puts Gem.loaded_specs.values.map(&:full_name).sort'"
       cmd = cmd.join(' ')
     else

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/