From 90bf4a8edb295308d07584d94366998ad0a7e988 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 6 Nov 2016 14:41:39 +0000
Subject: [PATCH] * test/ruby/test_optimization.rb
 (test_tailcall_interrupted_by_sigint):   send SIGKILL if the child process
 doesn't die within 1 second.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                      |  5 +++++
 test/ruby/test_optimization.rb | 18 +++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 91c4fc672f..7093ce4ca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov  6 23:36:07 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_optimization.rb (test_tailcall_interrupted_by_sigint):
+	  send SIGKILL if the child process doesn't die within 1 second.
+
 Sun Nov  6 21:54:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* tool/vcs.rb (export_changelog): generate ChangeLog file from
diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb
index 6f5262a69d..0205c92e2f 100644
--- a/test/ruby/test_optimization.rb
+++ b/test/ruby/test_optimization.rb
@@ -338,9 +338,21 @@ EOS
       in_p.write(script)
       in_p.close
       out_p.gets
-      Process.kill(:SIGINT, pid)
-      *, stat = Process.wait2(pid)
-      [stat, err_p.read]
+      sig = :INT
+      begin
+        Process.kill(sig, pid)
+        Timeout.timeout(1) do
+          *, stat = Process.wait2(pid)
+          [stat, err_p.read]
+        end
+      rescue Timeout::Error
+        if sig == :INT
+          sig = :KILL
+          retry
+        else
+          raise
+        end
+      end
     }
     assert_equal("INT", Signal.signame(status.termsig))
     assert_match(/Interrupt/, err, bug)