From ab4a126782db8c040d8aede8d1558468a6de7961 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Jun 2007 04:46:17 +0000
Subject: [PATCH] * test/ruby/test_beginendblock.rb
 (test_should_propagate_signaled):   get rid of invoking shell. 
 [ruby-dev:30942]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                       | 5 +++++
 test/ruby/suicide.rb            | 2 ++
 test/ruby/test_beginendblock.rb | 5 ++---
 version.h                       | 6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 test/ruby/suicide.rb

diff --git a/ChangeLog b/ChangeLog
index debc960906..2611fe8e7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 10 13:47:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
+	  get rid of invoking shell.  [ruby-dev:30942]
+
 Thu Jun  7 19:02:48 2007  Tanaka Akira  <akr@fsij.org>
 
 	* lib/pp.rb: call original "method" method instead of redefined one.
diff --git a/test/ruby/suicide.rb b/test/ruby/suicide.rb
new file mode 100644
index 0000000000..2687ed04cd
--- /dev/null
+++ b/test/ruby/suicide.rb
@@ -0,0 +1,2 @@
+STDERR.reopen(STDOUT)
+at_exit{Process.kill(:INT, $$)}
diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb
index 3b087593cd..656dd4f598 100644
--- a/test/ruby/test_beginendblock.rb
+++ b/test/ruby/test_beginendblock.rb
@@ -68,15 +68,14 @@ EOW
 
   def test_should_propagate_exit_code
     ruby = EnvUtil.rubybin
-    assert_equal false, system("#{q(ruby)} -e 'at_exit{exit 2}'")
+    assert_equal false, system(ruby, '-e', 'at_exit{exit 2}')
     assert_equal 2, $?.exitstatus
     assert_nil $?.termsig
   end
 
   def test_should_propagate_signaled
     ruby = EnvUtil.rubybin
-    out = IO.popen("#{q(ruby)} -e 'STDERR.reopen(STDOUT);" \
-		   "at_exit{Process.kill(:INT, $$)}'"){|f|
+    out = IO.popen("#{ruby} #{File.dirname(__FILE__)}/suicide.rb"){|f|
       f.read
     }
     assert_match /Interrupt$/, out
diff --git a/version.h b/version.h
index d08d995fa5..cda2415027 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-06-04"
+#define RUBY_RELEASE_DATE "2007-06-10"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070604
+#define RUBY_RELEASE_CODE 20070610
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 10
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];