ruby-changes:74374
From: Nobuyoshi <ko1@a...>
Date: Sun, 6 Nov 2022 23:44:22 +0900 (JST)
Subject: [ruby-changes:74374] 12883f8fa6 (master): GNU make 4.4 now uses a fifo for the jobserver
https://git.ruby-lang.org/ruby.git/commit/?id=12883f8fa6 From 12883f8fa6222324880e2b0f161f8c6d6cf365c7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sun, 6 Nov 2022 23:39:55 +0900 Subject: GNU make 4.4 now uses a fifo for the jobserver --- tool/lib/test/unit.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb index 59409f016c..fb1a53ce05 100644 --- a/tool/lib/test/unit.rb +++ b/tool/lib/test/unit.rb @@ -286,10 +286,15 @@ 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+)/ =~ makeflags + /(?:\A|\s)--jobserver-(?:auth|fds)=(?:(\d+),(\d+)|fifo:(.*))/ =~ makeflags begin - r = IO.for_fd($1.to_i(10), "rb", autoclose: false) - w = IO.for_fd($2.to_i(10), "wb", autoclose: false) + if fifo = $3 + r = File.open(fifo, IO::RDONLY|IO::NONBLOCK|IO::BINARY, autoclose: false) + w = File.open(fifo, IO::WRONLY|IO::NONBLOCK|IO::BINARY, autoclose: false) + else + r = IO.for_fd($1.to_i(10), "rb", autoclose: false) + w = IO.for_fd($2.to_i(10), "wb", autoclose: false) + end rescue r.close if r nil -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/