summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 15:11:30 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 15:11:30 +0000
commita847bedb1df3e0af9e1f0cc53ff831f4316dd46f (patch)
treefe80dd87f324f19078d93fdfd95476a161897bd2
parentb688029ae85afe8d816f34bd74cca5602e7a0e7f (diff)
* 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
-rw-r--r--ChangeLog9
-rw-r--r--test/rubygems/test_gem_installer.rb2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bc10408fa26..239e58ffd59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,18 @@
+Sat Dec 1 00:08:55 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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 <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.
+ see [ruby-core:50388].
Fri Nov 30 23:27:26 2012 NAKAMURA Usaku <usa@ruby-lang.org>
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index 7d1abf18c56..66451940217 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'