merge revision(s) 28387:

	* 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_8_7@28407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index caf327df17..a91fd690ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 23 22:22:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/optparse/test_summary.rb: fixed superclass so that it run
+	  solely.
+
 Wed Jun 23 21:54:17 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* marshal.c, test/ruby/test_marshal.rb: Revert r25230.  This test
diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb
index 12744a8a7b..bd533e6444 100644
--- a/test/optparse/test_summary.rb
+++ b/test/optparse/test_summary.rb
@@ -1,8 +1,6 @@
-require 'test/unit'
-require 'optparse'
+require '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|
diff --git a/version.h b/version.h
index bd8d5aba63..33ed4c3149 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-23"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100623
-#define RUBY_PATCHLEVEL 298
+#define RUBY_PATCHLEVEL 299
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8