summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-26 07:22:44 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-26 07:22:44 +0000
commitb2cdb79c7a0dd8898c4a03129d9b21ff11985bf5 (patch)
tree8104e64207a2db5ddf6d694f79efea29c3dc0184 /ChangeLog
parent7b9fffe6a4e8f7eed531178fc737a36a2122da78 (diff)
merge revision(s) 49806:
envutil.rb: timeout_error argument to invoke_ruby * test/lib/envutil.rb (invoke_ruby): add `timeout_error` optional keyword argument, the exception class to be raised if the target process timed out. if it is nil, no exception will be raised at timeout but the terminated output, error, and status will be returned. defaulted to Timeout::Error. * test/lib/envutil.rb (assert_separately): check outputs and status (including diagnostic reports) of timed-out process. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d2519545be..76aa269539 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sun Mar 26 16:22:03 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ envutil.rb: timeout_error argument to invoke_ruby
+
+ * test/lib/envutil.rb (invoke_ruby): add `timeout_error` optional
+ keyword argument, the exception class to be raised if the target
+ process timed out. if it is nil, no exception will be raised at
+ timeout but the terminated output, error, and status will be
+ returned. defaulted to Timeout::Error.
+
+ * test/lib/envutil.rb (assert_separately): check outputs and
+ status (including diagnostic reports) of timed-out process.
+
Sun Mar 26 13:07:21 2017 NAKAMURA Usaku <usa@ruby-lang.org>
* thread.c (rb_thread_sleep_deadly_allow_spurious_wakeup): need to