From 6dc0488148c33fe3839e898e011178fa006fa87d Mon Sep 17 00:00:00 2001 From: sorah Date: Mon, 23 May 2011 00:10:49 +0000 Subject: * lib/test/unit/parallel.rb: Never Ignore SIGINT. When received Interrupt, immediately puts result and exit. [ruby-dev:43571] * lib/test/unit.rb: When received Interrupt, wait results from workers and correct them. [ruby-dev:43571] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/test/unit/parallel.rb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'lib/test/unit') diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb index e433779a2e..c5d07e673b 100644 --- a/lib/test/unit/parallel.rb +++ b/lib/test/unit/parallel.rb @@ -42,7 +42,12 @@ module Test e, f, s = @errors, @failures, @skips - result = orig_run_suite(suite, type) + begin + result = orig_run_suite(suite, type) + rescue Interrupt + @need_exit = true + result = [nil,nil] + end MiniTest::Unit.output = orig_stdout @@ -73,8 +78,8 @@ module Test process_args args @@stop_auto_run = true @opts = @options.dup + @need_exit = false - Signal.trap(:INT,"IGNORE") @old_loadpath = [] begin @stdout = increment_io(STDOUT) @@ -101,7 +106,14 @@ module Test end _run_suites MiniTest::Unit::TestCase.test_suites-suites, $2.to_sym - @stdout.puts "ready" + if @need_exit + begin + @stdout.puts "bye" + rescue Errno::EPIPE; end + exit + else + @stdout.puts "ready" + end when /^quit$/ begin @stdout.puts "bye" -- cgit v1.2.3