merge revision(s) 23032:

shyouhei · shyouhei · commit 473f3eed1369 · 2009-07-04T18:55:44.000Z
* 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
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul  5 03:50:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
@@ -275,6 +275,6 @@ def self.run?
 
 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
@@ -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[];
