yugui	2008-12-29 15:18:14 +0900 (Mon, 29 Dec 2008)

  New Revision: 21150

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21150

  Log:
    merges r21134 from ruby_1_9_1 into trunk.
    * test/rubygems/test_gem_command.rb
      (test_add_option_overlapping_common_and_local_options):
      follows r21066.

  Modified files:
    trunk/ChangeLog
    trunk/test/rubygems/test_gem_command.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21149)
+++ ChangeLog	(revision 21150)
@@ -1,3 +1,9 @@
+Sun Dec 28 18:36:33 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* 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@y...>
 
 	* Makefile.in (ext-clean): ext-clean always fails.
Index: test/rubygems/test_gem_command.rb
===================================================================
--- test/rubygems/test_gem_command.rb	(revision 21149)
+++ test/rubygems/test_gem_command.rb	(revision 21150)
@@ -60,9 +60,9 @@
     @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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/