diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-29 06:52:18 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-29 06:52:18 +0000 |
commit | 9694bb8cac12969300692dac5a1cf7aa4e3a46cd (patch) | |
tree | c3cb423d701f7049ba9382de052e2a937cd1302d /test/rubygems/test_gem_ext_rake_builder.rb | |
parent | 3f606b7063fc7a8b191556365ad343a314719a8d (diff) | |
download | ruby-9694bb8cac12969300692dac5a1cf7aa4e3a46cd.tar.gz |
* lib/rubygems*: Updated to RubyGems 2.0
* test/rubygems*: ditto.
* common.mk (prelude): Updated for RubyGems 2.0 source rearrangement.
* tool/change_maker.rb: Allow invalid UTF-8 characters in source
files.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37976 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 | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/rubygems/test_gem_ext_rake_builder.rb b/test/rubygems/test_gem_ext_rake_builder.rb index d30664372d..c8fceb63ee 100644 --- a/test/rubygems/test_gem_ext_rake_builder.rb +++ b/test/rubygems/test_gem_ext_rake_builder.rb @@ -24,18 +24,18 @@ class TestGemExtRakeBuilder < Gem::TestCase output = [] realdir = nil # HACK /tmp vs. /private/tmp - build_rake_in do + build_rake_in do |rake| Dir.chdir @ext do realdir = Dir.pwd Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', nil, @dest_path, output end - end - output = output.join "\n" + output = output.join "\n" - refute_match %r%^rake failed:%, output - assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output - assert_match %r%^#{Regexp.escape @@rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, output + refute_match %r%^rake failed:%, output + assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output + assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, output + end end def test_class_build_fail @@ -44,22 +44,22 @@ class TestGemExtRakeBuilder < Gem::TestCase File.open("Rakefile","w") do |f| f.puts "task :default do abort 'fail' end" end - EO_MKRF + EO_MKRF end output = [] - error = assert_raises Gem::InstallError do - build_rake_in do + build_rake_in(false) do |rake| + error = assert_raises Gem::InstallError do Dir.chdir @ext do Gem::Ext::RakeBuilder.build "mkrf_conf.rb", nil, @dest_path, output end end - end - assert_match %r%^rake failed:%, error.message - assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, error.message - assert_match %r%^#{Regexp.escape @@rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, error.message + assert_match %r%^rake failed:%, error.message + assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, error.message + assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, error.message + end end end |