diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-01 12:33:11 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-01 12:33:11 +0000 |
commit | 498324c5d3cd08c2c306a4f91e3a11b7fda22835 (patch) | |
tree | e5d9ff28664f6a886fce613988987e1917db937c /test/rubygems/test_gem_ext_rake_builder.rb | |
parent | 807fbd69403bcae4bc38138a8f8a4bba5914dcda (diff) | |
download | ruby-498324c5d3cd08c2c306a4f91e3a11b7fda22835.tar.gz |
* lib/test/unit/ui/console/testrunner.rb: prevent destructive modification to $0.
* test/rubygems/gemutilities.rb (build_rake_in): move from test_gem_ext_rake_builder.rb.
* test/rubygems/test_gem_ext_rake_builder.rb: ditto.
* test/rubygems/test_gem_installer.rb: override Gem.ruby and ENV["rake"].
* test/rubygems/test_gem_uninstaller.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem_ext_rake_builder.rb')
-rw-r--r-- | test/rubygems/test_gem_ext_rake_builder.rb | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/test/rubygems/test_gem_ext_rake_builder.rb b/test/rubygems/test_gem_ext_rake_builder.rb index 6bc3ea08eb..6d9184e804 100644 --- a/test/rubygems/test_gem_ext_rake_builder.rb +++ b/test/rubygems/test_gem_ext_rake_builder.rb @@ -3,9 +3,6 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') require 'rubygems/ext' class TestGemExtRakeBuilder < RubyGemTestCase - @@ruby = ENV["RUBY"] - @@rake = ENV["rake"] || (@@ruby + " " + File.expand_path("../../../bin/rake", __FILE__)) - def setup super @@ -16,24 +13,6 @@ class TestGemExtRakeBuilder < RubyGemTestCase FileUtils.mkdir_p @dest_path end - def build_rake_in dir - gem_ruby = Gem.ruby - ruby = @@ruby - Gem.module_eval {@ruby = ruby} - env_rake = ENV["rake"] - ENV["rake"] = @@rake - Dir.chdir dir do - yield @@rake - end - ensure - Gem.module_eval {@ruby = gem_ruby} - if env_rake - ENV["rake"] = env_rake - else - ENV.delete("rake") - end - end - def test_class_build File.open File.join(@ext, 'mkrf_conf.rb'), 'w' do |mkrf_conf| mkrf_conf.puts <<-EO_MKRF @@ -46,9 +25,11 @@ class TestGemExtRakeBuilder < RubyGemTestCase output = [] realdir = nil # HACK /tmp vs. /private/tmp - build_rake_in @ext do - realdir = Dir.pwd - Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', nil, @dest_path, output + build_rake_in do + Dir.chdir @ext do + realdir = Dir.pwd + Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', nil, @dest_path, output + end end expected = [ @@ -73,8 +54,10 @@ class TestGemExtRakeBuilder < RubyGemTestCase output = [] error = assert_raise Gem::InstallError do - build_rake_in @ext do - Gem::Ext::RakeBuilder.build "mkrf_conf.rb", nil, @dest_path, output + build_rake_in do + Dir.chdir @ext do + Gem::Ext::RakeBuilder.build "mkrf_conf.rb", nil, @dest_path, output + end end end |