From a738b98fc6d70f36724a19b49fcce6a508c7da06 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 9 May 2014 15:13:11 +0000
Subject: test_beginendblock.rb, test_signal.rb: run with default handler

* test/ruby/test_beginendblock.rb (test_propagate_signaled): run
  with default handler.

* test/ruby/test_signal.rb (test_hup_me): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_beginendblock.rb | 1 +
 test/ruby/test_signal.rb        | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'test')

diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb
index 30db5024cc..d9c1f56916 100644
--- a/test/ruby/test_beginendblock.rb
+++ b/test/ruby/test_beginendblock.rb
@@ -112,6 +112,7 @@ EOW
     ruby = EnvUtil.rubybin
     out = IO.popen(
       [ruby,
+       '-e', 'trap(:INT, "DEFAULT")',
        '-e', 'STDERR.reopen(STDOUT)',
        '-e', 'at_exit{Process.kill(:INT, $$); sleep 5 }']) {|f|
       timeout(10) {
diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb
index 8dd4db7bb0..9bf4cc866a 100644
--- a/test/ruby/test_signal.rb
+++ b/test/ruby/test_signal.rb
@@ -256,9 +256,12 @@ EOS
     # that signal will be deliverd synchronously.
     # This ugly workaround was introduced to don't break
     # compatibility against silly example codes.
+    assert_separately(<<-RUBY)
+    trap(:HUP, "DEFAULT")
     assert_raise(SignalException) {
       Process.kill('HUP', Process.pid)
     }
+    RUBY
     bug8137 = '[ruby-dev:47182] [Bug #8137]'
     assert_nothing_raised(bug8137) {
       Timeout.timeout(1) {
-- 
cgit v1.2.3