akr	2014-11-30 18:57:04 +0900 (Sun, 30 Nov 2014)

  New Revision: 48654

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48654

  Log:
    * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
      Don't raise Interrupt.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_process.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48653)
+++ ChangeLog	(revision 48654)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Nov 30 18:55:32 2014  Tanaka Akira  <akr@f...>
+
+	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+	  Don't raise Interrupt.
+
 Sun Nov 30 17:11:05 2014  Tanaka Akira  <akr@f...>
 
 	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): Use
Index: test/ruby/test_process.rb
===================================================================
--- test/ruby/test_process.rb	(revision 48653)
+++ test/ruby/test_process.rb	(revision 48654)
@@ -1959,7 +1959,13 @@ EOS https://github.com/ruby/ruby/blob/trunk/test/ruby/test_process.rb#L1959
           _, status = Process.wait2(runner.pid)
         rescue IO::WaitReadable => e
           Process.kill(:INT, runner.pid)
-          raise Marshal.load(er.read.unpack("m")[0])
+          exc = Marshal.load(er.read.unpack("m")[0])
+          if exc.kind_of? Interrupt
+            # Don't raise Interrupt.  It aborts test-all.
+            flunk "timeout"
+          else
+            raise exc
+          end
         end
         assert_predicate(status, :success?)
       ensure

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/