From 0ec5a272f1981d678da0d464c249120bd5aafc38 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 2 Jul 2015 04:56:36 +0000 Subject: [PATCH] revert r51101 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ------- test/rubygems/test_require.rb | 3 --- 2 files changed, 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09f38705ae..40e2ec4a4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,3 @@ -Thu Jul 2 12:31:56 2015 Nobuyoshi Nakada - - * 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 * test/rubygems/test_gem_server.rb (process_based_port): use diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index 82ecff400b..96906595d7 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -51,8 +51,6 @@ class TestGemRequire < Gem::TestCase # 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 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