From cdac7f430d0618129c3032c29816332b68795206 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 2 Mar 2013 17:39:26 +0000 Subject: merge revision(s) 39277: * test/ruby/test_thread.rb: fixed typo patched by Hiroki Matsue via https://github.com/ruby/ruby/pull/248 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/test_thread.rb | 4 ++-- version.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5ac660d80..9c4812ccba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 3 02:39:01 2013 Ayumu AIZAWA + + * test/ruby/test_thread.rb: fixed typo + patched by Hiroki Matsue via https://github.com/ruby/ruby/pull/248 + Sun Mar 3 02:22:56 2013 Nobuyoshi Nakada * class.c (include_modules_at): detect cyclic prepend with original diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 52e6d67560..63921bb2da 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -669,8 +669,8 @@ class TestThread < Test::Unit::TestCase q.push :ng1 end begin - Thread.handle_interrupthandle_interrupt(Object => :immediate){} if Thread.pending_interrupt? - rescue => e + Thread.handle_interrupt(Object => :immediate){} if Thread.pending_interrupt? + rescue RuntimeError => e q.push :ok end rescue => e diff --git a/version.h b/version.h index 1f2959b315..dbd7731448 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-03" -#define RUBY_PATCHLEVEL 7 +#define RUBY_PATCHLEVEL 8 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3