summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-26 07:25:05 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-26 07:25:05 +0000
commit1fb37c4c1af40584a9238615808af3cb22e11428 (patch)
treefa3c95a7722f627443ef02a3179d9bba59ca4aea
parentb2cdb79c7a0dd8898c4a03129d9b21ff11985bf5 (diff)
* test/ruby/test_thread.rb (test_thread_interrupt_for_killed_thread):
may fix the test failure on some platforms introduced at r58108. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_thread.rb2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 76aa269539..54a1c60dea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 26 16:24:02 2017 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/ruby/test_thread.rb (test_thread_interrupt_for_killed_thread):
+ may fix the test failure on some platforms introduced at r58108.
+
Sun Mar 26 16:22:03 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
envutil.rb: timeout_error argument to invoke_ruby
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index 57080ac6ea..109a01117b 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -1050,7 +1050,7 @@ q.pop
end if Process.respond_to?(:fork)
def test_thread_interrupt_for_killed_thread
- assert_normal_exit(<<-_end, '[Bug #8996]', timeout: 5)
+ assert_normal_exit(<<-_end, '[Bug #8996]', timeout: 5, timeout_error: nil)
trap(/mswin|mignw/ =~ RUBY_PLATFORM ? :KILL : :TERM){exit}
while true
t = Thread.new{sleep 0}
diff --git a/version.h b/version.h
index 44e195b084..5c2243f993 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26"
-#define RUBY_PATCHLEVEL 466
+#define RUBY_PATCHLEVEL 467
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3