From d7d361a316ab554aaa2e773d2dee9644c81b2ff5 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 13 Aug 2010 07:12:18 +0000 Subject: [PATCH] * lib/test/unit.rb (MiniTest::Unit.new): extend before initialize. [ruby-dev:41970] * lib/test/unit.rb (MiniTest::Unit.autorun): use Test::Unit::Mini. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ lib/test/unit.rb | 10 +++++++--- version.h | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b31f75e7ae..a606674285 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Aug 13 16:11:36 2010 Nobuyoshi Nakada + + * lib/test/unit.rb (MiniTest::Unit.new): extend before initialize. + [ruby-dev:41970] + + * lib/test/unit.rb (MiniTest::Unit.autorun): use Test::Unit::Mini. + Thu Aug 12 23:39:02 2010 Tanaka Akira * ext/pathname/pathname.c (path_make_symlink): Pathname#make_symlink diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 259ff98313..68fd808102 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -151,16 +151,20 @@ module Test end class MiniTest::Unit - def self.new(*) - super + def self.new(*args, &block) + obj = allocate .extend(Test::Unit::RunCount) .extend(Test::Unit::Options) + obj.__send__(:initialize, *args, &block) + obj end class << self; undef autorun; end def self.autorun at_exit { - Test::Unit::RunCount.run_once {exit(new.run(ARGV) || true)} + Test::Unit::RunCount.run_once { + exit(Test::Unit::Mini.new.run(ARGV) || true) + } } unless @@installed_at_exit @@installed_at_exit = true end diff --git a/version.h b/version.h index 3be2b3c538..6a7cdd7675 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_RELEASE_DATE "2010-08-12" +#define RUBY_RELEASE_DATE "2010-08-13" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h"