diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-29 13:42:18 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-29 13:42:18 +0000 |
| commit | 59130ced833ef34c24f11d47ebd56af0ba3b5164 (patch) | |
| tree | 627c8eb1928642288106ad267e72b14493d52f80 | |
| parent | de5c0b839b25c0b482f7a849cb2965c67b5c4073 (diff) | |
* lib/test/unit.rb (Test::Unit::Runner::Worker#_run_parallels): fix
premature exit when all workers' status are :ready or :prepare.
[ruby-dev:45061] [Bug #5822]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/test/unit.rb | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Dec 29 22:36:16 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> + + * lib/test/unit.rb (Test::Unit::Runner::Worker#_run_parallels): fix + premature exit when all workers' status are :ready or :prepare. + [ruby-dev:45061] [Bug #5822] + Thu Dec 29 01:51:13 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> * include/ruby/ruby.h: fix #error pragma. LLP64 platform is supported. diff --git a/lib/test/unit.rb b/lib/test/unit.rb index eb0666a0e6..00313a3237 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -457,7 +457,9 @@ module Test bang = $1 worker.status = :ready if @tasks.empty? - break unless @workers.find{|x| x.status == :running } + unless @workers.find{|x| [:running, :prepare].include? x.status} + break + end else if @options[:separate] && bang.empty? @workers_hash.delete worker.io |