summaryrefslogtreecommitdiff
path: root/test/lib/test/unit.rb
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-05 16:07:30 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-05 16:07:30 +0000
commit643a935e9692c7965e7b019254ce591782be7ac1 (patch)
treea02fc215cc89734c6e6bda92550b55b04acde54e /test/lib/test/unit.rb
parent48d61170a2d23ae7b0040800480e3f89254bcce8 (diff)
@job_tokens is defined iff @jobserver is true
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/lib/test/unit.rb')
-rw-r--r--test/lib/test/unit.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb
index 9173e5414c..f3aff4ee8c 100644
--- a/test/lib/test/unit.rb
+++ b/test/lib/test/unit.rb
@@ -458,7 +458,7 @@ module Test
(deal(io, type, result, rep).nil? and
!@workers.any? {|x| [:running, :prepare].include? x.status})
end
- if @job_tokens and !@tasks.empty? and !@workers.any? {|x| x.status == :ready}
+ if @jobserver and @job_tokens and !@tasks.empty? and !@workers.any? {|x| x.status == :ready}
t = @jobserver[0].read_nonblock([@tasks.size, @options[:parallel]].min, exception: false)
if String === t
@job_tokens << t