nobu	2015-07-02 13:56:36 +0900 (Thu, 02 Jul 2015)

  New Revision: 51102

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

  Log:
    revert r51101

  Modified files:
    trunk/ChangeLog
    trunk/test/rubygems/test_require.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 51101)
+++ ChangeLog	(revision 51102)
@@ -1,10 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
-Thu Jul  2 12:31:56 2015  Nobuyoshi Nakada  <nobu@r...>
-
-	* test/rubygems/test_require.rb (test_dash_i_beats_gems): skip
-	  because the target feature just does not work.  requiring a gem
-	  inserts its paths and its dependents' paths at the beginning of
-	  $LOAD_PATH, regardless -I options.
-
 Thu Jul  2 12:26:11 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/rubygems/test_gem_server.rb (process_based_port): use
Index: test/rubygems/test_require.rb
===================================================================
--- test/rubygems/test_require.rb	(revision 51101)
+++ test/rubygems/test_require.rb	(revision 51102)
@@ -51,8 +51,6 @@ class TestGemRequire < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_require.rb#L51
 
   # Providing -I on the commandline should always beat gems
   def test_dash_i_beats_gems
-    skip "just does not work"
-
     a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
     b1 = new_spec "b", "1", {"c" => "> 0"}, "lib/b/c.rb"
     c1 = new_spec "c", "1", nil, "lib/c/c.rb"
@@ -77,7 +75,6 @@ class TestGemRequire < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_require.rb#L75
     assert_require 'b/c' # this should be required from -I
     assert_equal "world", ::Object::HELLO
   ensure
-    return
     $LOAD_PATH.replace lp
     Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
   end

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