merges r28387 from trunk into ruby_1_9_2.

-- * test/optparse/test_summary.rb: fixed superclass so that it run solely. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Jun 29, 2010 · 21d1a32 · 21d1a32
1 parent a90b1b5
commit 21d1a32
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 22 21:33:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/optparse/test_summary.rb: fixed superclass so that it run
+	  solely.
+
 Sat Jun 19 03:35:58 2010  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych/visitors/to_ruby.rb (resolve_klass): fix the

diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb
@@ -1,8 +1,6 @@
-require 'test/unit'
-require 'optparse'
+require_relative 'test_optparse'
 
-class TestOptionParser < Test::Unit::TestCase; end
-class TestOptionParser::SummaryTest < Test::Unit::TestCase
+class TestOptionParser::SummaryTest < TestOptionParser
   def test_short_clash
     r = nil
     o = OptionParser.new do |opts|