diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-17 14:20:55 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-17 14:20:55 +0000 |
commit | bbe800082102cebcc696cb76e528c03e8b146538 (patch) | |
tree | 5f14d5e93bf9e292cf59898ce29a28457223d495 /test/rubygems | |
parent | 5d6aa9ba8b0130ec6d6b5a81a03172e0db317fd8 (diff) |
merge revision(s) 39559: [Backport #7991]
* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
use RUBYOPT instead of -r option, and revert some tests. [Bug #7698]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems')
-rw-r--r-- | test/rubygems/test_gem_ext_ext_conf_builder.rb | 6 | ||||
-rw-r--r-- | test/rubygems/test_gem_installer.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb index c899592442..734569583a 100644 --- a/test/rubygems/test_gem_ext_ext_conf_builder.rb +++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb @@ -30,7 +30,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output end - assert_match(/^#{Gem.ruby} .*extconf.rb/, output[0]) + assert_match(/^#{Gem.ruby} extconf.rb/, output[0]) assert_equal "creating Makefile\n", output[1] case RUBY_PLATFORM when /mswin/ then @@ -107,10 +107,10 @@ class TestGemExtExtConfBuilder < Gem::TestCase assert_match(/\Aextconf failed: -#{Gem.ruby} .*extconf.rb.* +#{Gem.ruby} extconf.rb.* checking for main\(\) in .*?nonexistent/m, error.message) - assert_match(/^#{Gem.ruby} .*extconf.rb/, output[0]) + assert_equal("#{Gem.ruby} extconf.rb", output[0]) end def test_class_make diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index bc1788600c..7387f3ab0c 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -81,7 +81,7 @@ load Gem.bin_path('a', 'executable', version) gem_make_out = File.join @gemhome, 'gems', @spec.full_name, 'gem_make.out' - assert_match %r%#{Regexp.escape Gem.ruby} .*extconf\.rb%, + assert_match %r%#{Regexp.escape Gem.ruby} extconf\.rb%, File.read(gem_make_out) assert_match %r%#{Regexp.escape Gem.ruby}: No such file%, File.read(gem_make_out) |