From a3656d4222509f0befa6d01f0ccd3f7a9442665b Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 11 May 2014 01:02:47 +0000 Subject: [PATCH] signal.c: directly deliver non-handlable signals * signal.c (rb_f_kill): directly deliver signals which cannot be handled, i.e., SIGKILL and SIGSTOP. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- signal.c | 6 ++++++ test/ruby/test_process.rb | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/signal.c b/signal.c index 82c9125c90..05b21a9ad9 100644 --- a/signal.c +++ b/signal.c @@ -464,6 +464,12 @@ rb_f_kill(int argc, VALUE *argv) case SIGSEGV: #ifdef SIGBUS case SIGBUS: +#endif +#ifdef SIGKILL + case SIGKILL: +#endif +#ifdef SIGSTOP + case SIGSTOP: #endif ruby_kill(pid, sig); break; diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 94fda02ebb..5abc5bca0b 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -1200,6 +1200,21 @@ class TestProcess < Test::Unit::TestCase end def test_status_kill + return unless Process.respond_to?(:kill) + return unless Signal.list.include?("KILL") + + with_tmpchdir do + write_file("foo", "Process.kill(:KILL, $$); exit(42)") + system(RUBY, "foo") + s = $? + assert_equal([false, true, false, nil], + [s.exited?, s.signaled?, s.stopped?, s.success?], + "[s.exited?, s.signaled?, s.stopped?, s.success?]") + assert_equal(false, s.exited?) + end + end + + def test_status_quit return unless Process.respond_to?(:kill) return unless Signal.list.include?("QUIT")