summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_process.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 4f67cf36fd..0a6317aa54 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1959,7 +1959,13 @@ EOS
_, 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