* test/rubygems/test_gem_installer.rb

(TestGemInstaller#test_check_executable_overwrite_default_bin_dir):
  if the executable to be overwritten was generated by rubygems, the
  error messsage differs from the only copied one's.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-11-30 14:43:10 +00:00
parent 053ca25f2d
commit ec7d935ce7
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,10 @@
Fri Nov 30 23:39:58 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/rubygems/test_gem_installer.rb
(TestGemInstaller#test_check_executable_overwrite_default_bin_dir):
if the executable to be overwritten was generated by rubygems, the
error messsage differs from the only copied one's.
Fri Nov 30 23:27:26 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/rubygems/test_gem_ext_ext_conf_builder.rb

View File

@ -180,7 +180,7 @@ load Gem.bin_path('a', 'executable', version)
end
conflicted = File.join @gemhome, 'bin', 'executable'
assert_equal "\"executable\" from a conflicts with #{conflicted}",
assert_match /\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z/,
e.message
end
ensure