From 473f3eed13690987a2437623c6837a0f965f95f1 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 4 Jul 2009 18:55:44 +0000 Subject: merge revision(s) 23032: * lib/test/unit.rb: use Kernel.exit to get rid of using IRB::ExtendCommandBundle#exit. a patch from Dmitry Vazhov by [ruby-core:22986]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/test/unit.rb | 2 +- version.h | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12cd4d6dfa..7c42bd8b87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jul 5 03:50:52 2009 Nobuyoshi Nakada + + * lib/test/unit.rb: use Kernel.exit to get rid of using + IRB::ExtendCommandBundle#exit. a patch from Dmitry Vazhov by + [ruby-core:22986]. + Fri Jul 3 09:05:38 2009 Masatoshi SEKI * lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network diff --git a/lib/test/unit.rb b/lib/test/unit.rb index b71f644566..ca68424b30 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -275,6 +275,6 @@ end at_exit do unless $! || Test::Unit.run? - exit Test::Unit::AutoRunner.run + Kernel.exit Test::Unit::AutoRunner.run end end diff --git a/version.h b/version.h index 884b700de5..f4e28ee446 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-07-03" +#define RUBY_RELEASE_DATE "2009-07-05" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090703 -#define RUBY_PATCHLEVEL 177 +#define RUBY_RELEASE_CODE 20090705 +#define RUBY_PATCHLEVEL 178 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 5 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3