aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-03 13:26:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-03 13:26:40 +0000
commitf73aefc6278962cb6ae682113b64e31d22e7d16a (patch)
tree96cce2ddfc782f9f88255882058584d29c07bd85
parentdff21f052f9f6e1cb038b95fadca21b6755a9c60 (diff)
downloadruby-f73aefc6278962cb6ae682113b64e31d22e7d16a.tar.gz
* test/lib/envutil.rb (EnvUtil.invoke_ruby): need to rescue because
Signal.signame may raise exception. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/lib/envutil.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index edaa768d88..6b09fe7ee9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 3 22:25:24 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/lib/envutil.rb (EnvUtil.invoke_ruby): need to rescue because
+ Signal.signame may raise exception.
+
Tue Mar 3 16:57:39 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* tool/redmine-backporter.rb: use 'b' instead of 's' for showing
diff --git a/test/lib/envutil.rb b/test/lib/envutil.rb
index 8d4dc707c7..fab8de9a95 100644
--- a/test/lib/envutil.rb
+++ b/test/lib/envutil.rb
@@ -70,7 +70,7 @@ module EnvUtil
unless (!th_stdout || th_stdout.join(timeout)) && (!th_stderr || th_stderr.join(timeout))
signals = Array(signal).select do |sig|
DEFAULT_SIGNALS[sig.to_s] or
- DEFAULT_SIGNALS[Signal.signame(sig)]
+ DEFAULT_SIGNALS[Signal.signame(sig)] rescue false
end
signals |= [:KILL]
case pgroup = opt[:pgroup]