From a847bedb1df3e0af9e1f0cc53ff831f4316dd46f Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 30 Nov 2012 15:11:30 +0000 Subject: * test/rubygems/test_gem_installer.rb (TestGemInstaller#test_check_executable_overwrite_other_non_gem): on Windows, rubygems always generate a wrapper .bat file when installing a file into bin, so testing no-overwrite a wrapper file and a non-wrapper file is nonsence. see [ruby-core:50388]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ test/rubygems/test_gem_installer.rb | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bc10408fa2..239e58ffd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,18 @@ +Sat Dec 1 00:08:55 2012 NAKAMURA Usaku + + * test/rubygems/test_gem_installer.rb + (TestGemInstaller#test_check_executable_overwrite_other_non_gem): + on Windows, rubygems always generate a wrapper .bat file when + installing a file into bin, so testing no-overwrite a wrapper file + and a non-wrapper file is nonsence. see [ruby-core:50388]. + Fri Nov 30 23:39:58 2012 NAKAMURA Usaku * 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. + see [ruby-core:50388]. Fri Nov 30 23:27:26 2012 NAKAMURA Usaku diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 7d1abf18c5..6645194021 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -229,7 +229,7 @@ load Gem.bin_path('a', 'executable', version) wrapper = File.read installed_exec assert_match %r|generated by RubyGems|, wrapper - end + end unless Gem.win_platform? def test_ensure_dependency quick_spec 'a' -- cgit v1.2.3