Permalink
Browse files

merge revision(s) 28387:

	* test/optparse/test_summary.rb: fixed superclass so that it run
	  solely.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@28407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
shyouhei committed Jun 23, 2010
1 parent 1840dca commit e7dff9fb2c3a7ca041f6b9e50443350848d313b8
Showing with 8 additions and 5 deletions.
  1. +5 −0 ChangeLog
  2. +2 −4 test/optparse/test_summary.rb
  3. +1 −1 version.h
View
@@ -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
@@ -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|
View
@@ -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

0 comments on commit e7dff9f

Please sign in to comment.