diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-11 14:02:18 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-11 14:02:18 +0000 |
| commit | a260025a02ea425d59b8758b06832fb7fe23289a (patch) | |
| tree | e6841ba92268b5e31a45998343be1596d61e493c | |
| parent | 87a9a150447ab42e5942e89b3616c6cc07d09866 (diff) | |
merges r28279 from trunk into ruby_1_9_2.
---
* lib/rubygems/install_update_options.rb
(Gem::InstallUpdateOptions#add_install_update_options): deprecate
--test option which has not worked. [ruby-core:21714]
* test/rubygems/test_gem_command_manager.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/rubygems/install_update_options.rb | 5 | ||||
| -rw-r--r-- | test/rubygems/test_gem_command_manager.rb | 2 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Fri Jun 11 22:39:50 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * lib/rubygems/install_update_options.rb + (Gem::InstallUpdateOptions#add_install_update_options): deprecate + --test option which has not worked. [ruby-core:21714] + + * test/rubygems/test_gem_command_manager.rb: ditto. + Fri Jun 11 22:36:25 2010 Yusuke Endoh <mame@tsg.ne.jp> * README: add a note about linking a library whose license is not diff --git a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb index c3fa2d5edd..4e7f9e7952 100644 --- a/lib/rubygems/install_update_options.rb +++ b/lib/rubygems/install_update_options.rb @@ -59,8 +59,7 @@ module Gem::InstallUpdateOptions end add_option(:"Install/Update", '-t', '--[no-]test', - 'Run unit tests prior to installation') do |value, options| - options[:test] = value + 'Ignored; just for compatiblity') do |value, options| end add_option(:"Install/Update", '-w', '--[no-]wrappers', @@ -110,7 +109,7 @@ module Gem::InstallUpdateOptions # Default options for the gem install command. def install_update_defaults_str - '--rdoc --no-force --no-test --wrappers' + '--rdoc --no-force --wrappers' end end diff --git a/test/rubygems/test_gem_command_manager.rb b/test/rubygems/test_gem_command_manager.rb index c81cc59abf..815798ae06 100644 --- a/test/rubygems/test_gem_command_manager.rb +++ b/test/rubygems/test_gem_command_manager.rb @@ -67,7 +67,6 @@ class TestGemCommandManager < RubyGemTestCase check_options = nil @command_manager.process_args( "install --force --test --local --rdoc --install-dir . --version 3.0 --no-wrapper --bindir . ") - assert_equal true, check_options[:test] assert_equal true, check_options[:generate_rdoc] assert_equal true, check_options[:force] assert_equal :local, check_options[:domain] @@ -197,7 +196,6 @@ class TestGemCommandManager < RubyGemTestCase #check settings check_options = nil @command_manager.process_args("update --force --test --rdoc --install-dir .") - assert_equal true, check_options[:test] assert_equal true, check_options[:generate_rdoc] assert_equal true, check_options[:force] assert_equal Dir.pwd, check_options[:install_dir] |