[前][次][番号順一覧][スレッド一覧]

ruby-changes:74377

From: Nobuyoshi <ko1@a...>
Date: Mon, 7 Nov 2022 10:12:22 +0900 (JST)
Subject: [ruby-changes:74377] ab01b8f23f (master): jobserver option may not be at the last

https://git.ruby-lang.org/ruby.git/commit/?id=ab01b8f23f

From ab01b8f23f1e218fa5a360806120a1d6eaaa228f Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 7 Nov 2022 09:43:45 +0900
Subject: 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 https://github.com/ruby/ruby/blob/trunk/tool/lib/test/unit.rb#L286
         @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
-- 
cgit v1.2.3


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]