aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/rubygems/test_gem_command.rb6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cd9b307f04..0e71660b69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec 28 18:36:33 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * test/rubygems/test_gem_command.rb
+ (test_add_option_overlapping_common_and_local_options):
+ follows r21066.
+
Mon Dec 29 14:50:19 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* Makefile.in (ext-clean): ext-clean always fails.
diff --git a/test/rubygems/test_gem_command.rb b/test/rubygems/test_gem_command.rb
index 08da9fb7d6..ff63804a4a 100644
--- a/test/rubygems/test_gem_command.rb
+++ b/test/rubygems/test_gem_command.rb
@@ -60,9 +60,9 @@ class TestGemCommand < RubyGemTestCase
@cmd.add_option('-z', '--exe', 'BAD!') do end
@cmd.add_option('-x', '--exe', 'BAD!') do end
- assert_match %r|-x, --zip|, @cmd.parser.to_s
- assert_match %r|-z, --exe|, @cmd.parser.to_s
- refute_match %r|-x, --exe|, @cmd.parser.to_s
+ assert_match %r|-x, --exe|, @cmd.parser.to_s
+ refute_match %r|-z, --exe|, @cmd.parser.to_s
+ refute_match %r|-x, --zip|, @cmd.parser.to_s
end
def test_basic_accessors