diff options
| author | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-02 05:56:55 +0000 |
|---|---|---|
| committer | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-02 05:56:55 +0000 |
| commit | bb28d902e8ce770e7971505c28fa31f441969776 (patch) | |
| tree | 595dce00fbe9c69ab5c2a016c3409d12e2bf53f3 | |
| parent | 1cf47c4cc0ef262fad10b9f46f4d5a28d9b4caf4 (diff) | |
| download | ruby-bb28d902e8ce770e7971505c28fa31f441969776.tar.gz | |
* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): find may
return nil and nil can not dup.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/test/unit.rb | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Jan 2 14:55:28 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + + * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): find may + return nil and nil can not dup. + Sun Jan 1 12:23:10 2012 Akinori MUSHA <knu@iDaemons.org> * lib/shellwords.rb (Shellwords#shellescape): Drop the //n flag diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 00313a3237..1bee643c31 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -433,8 +433,9 @@ module Test while stat = Process.wait2 break if @interrupt # Break when interrupt pid, stat = stat - w = (@workers + @dead_workers).find{|x| pid == x.pid }.dup + w = (@workers + @dead_workers).find{|x| pid == x.pid } next unless w + w = w.dup if w.status != :quit && !w.quit_called? # Worker down w.died(nil, !stat.signaled? && stat.exitstatus) |