summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-04-14 13:48:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-04-14 13:48:00 +0000
commited1c3f56c09c12d6921ccbe5b206c2ce4522aab2 (patch)
treed3cdb4ace8399b7f50cb33677ab0d586b230df74 /lib
parent311b3b4ff8fe2e6878041ccf225a41cf74f70f71 (diff)
* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): check if worker
is signaled and use its exit status. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/test/unit.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 6fba30043a..6db79213a3 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -329,7 +329,7 @@ module Test
@@installed_at_exit = true
end
- def after_worker_down(worker, e=nil, c=1)
+ def after_worker_down(worker, e=nil, c=false)
return unless @opts[:parallel]
return if @interrupt
if e
@@ -404,11 +404,12 @@ module Test
watchdog = Thread.new do
while stat = Process.wait2
break if @interrupt # Break when interrupt
- w = (@workers + @dead_workers).find{|x| stat[0] == x.pid }.dup
+ pid, stat = stat
+ w = (@workers + @dead_workers).find{|x| pid == x.pid }.dup
next unless w
unless w.status == :quit
# Worker down
- w.dead(nil, stat[1].to_i)
+ w.dead(nil, !stat.signaled? && stat.exitstatus)
end
end
end