default.mspec: defer job tokens

* spec/default.mspec (MSpecScript::JobServer#cores): defer getting
  job tokens until required.  when running only one spec file,
  `-j` option has no effect.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-04-09 01:23:02 +00:00
parent a2ab6d8f97
commit 07cfb683a4

View File

@ -25,27 +25,40 @@ class MSpecScript
] ]
end end
class MSpecScript module MSpecScript::JobServer
if /(?:\A|\s)--jobserver-(?:auth|fds)=(\d+),(\d+)/ =~ ENV["MAKEFLAGS"] def cores
begin if /(?:\A|\s)--jobserver-(?:auth|fds)=(\d+),(\d+)/ =~ ENV["MAKEFLAGS"]
r = IO.for_fd($1.to_i(10), "rb", autoclose: false) cores = 0
w = IO.for_fd($2.to_i(10), "wb", autoclose: false) begin
rescue r = IO.for_fd($1.to_i(10), "rb", autoclose: false)
r.close if r w = IO.for_fd($2.to_i(10), "wb", autoclose: false)
else jobtokens = r.read_nonblock(1024)
jobtokens = r.read_nonblock(1024) else
cores = jobtokens.size cores = jobtokens.size
if cores > 0 if cores > 0
jobserver = w jobserver = w
at_exit { w = nil
jobserver.print(jobtokens) at_exit {
jobserver.close jobserver.print(jobtokens)
} jobserver.close
end }
remove_method :cores MSpecScript::JobServer.module_eval do
define_method(:cores) do remove_method :cores
cores define_method(:cores) do
cores
end
end
return cores
end
ensure
r&.close
w&.close
end end
end end
super
end end
end end
class MSpecScript
prepend JobServer
end