mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
jobserver option may not be at the last
This commit is contained in:
parent
180d37c817
commit
ab01b8f23f
1 changed files with 2 additions and 1 deletions
|
@ -286,9 +286,10 @@ module Test
|
||||||
@jobserver = nil
|
@jobserver = nil
|
||||||
makeflags = ENV.delete("MAKEFLAGS")
|
makeflags = ENV.delete("MAKEFLAGS")
|
||||||
if !options[:parallel] and
|
if !options[:parallel] and
|
||||||
/(?:\A|\s)--jobserver-(?:auth|fds)=(?:(\d+),(\d+)|fifo:(.*))/ =~ makeflags
|
/(?:\A|\s)--jobserver-(?:auth|fds)=(?:(\d+),(\d+)|fifo:((?:\\.|\S)+))/ =~ makeflags
|
||||||
begin
|
begin
|
||||||
if fifo = $3
|
if fifo = $3
|
||||||
|
fifo.gsub!(/\\(?=.)/, '')
|
||||||
r = File.open(fifo, IO::RDONLY|IO::NONBLOCK|IO::BINARY)
|
r = File.open(fifo, IO::RDONLY|IO::NONBLOCK|IO::BINARY)
|
||||||
w = File.open(fifo, IO::WRONLY|IO::NONBLOCK|IO::BINARY)
|
w = File.open(fifo, IO::WRONLY|IO::NONBLOCK|IO::BINARY)
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue