From ab01b8f23f1e218fa5a360806120a1d6eaaa228f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 7 Nov 2022 09:43:45 +0900 Subject: [PATCH] jobserver option may not be at the last --- tool/lib/test/unit.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb index 80d69dd38a..0449fa215a 100644 --- a/tool/lib/test/unit.rb +++ b/tool/lib/test/unit.rb @@ -286,9 +286,10 @@ module Test @jobserver = nil makeflags = ENV.delete("MAKEFLAGS") if !options[:parallel] and - /(?:\A|\s)--jobserver-(?:auth|fds)=(?:(\d+),(\d+)|fifo:(.*))/ =~ makeflags + /(?:\A|\s)--jobserver-(?:auth|fds)=(?:(\d+),(\d+)|fifo:((?:\\.|\S)+))/ =~ makeflags begin if fifo = $3 + fifo.gsub!(/\\(?=.)/, '') r = File.open(fifo, IO::RDONLY|IO::NONBLOCK|IO::BINARY) w = File.open(fifo, IO::WRONLY|IO::NONBLOCK|IO::BINARY) else