From b02b8e77562661865b380d78e7621edfd8149a8f Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Mon, 7 Nov 2022 10:08:30 +0900
Subject: Let other test runners follow the change of GNU make 4.4 jobserver

---
 spec/default.mspec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'spec/default.mspec')

diff --git a/spec/default.mspec b/spec/default.mspec
index 0dba98306c..33ac691b94 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -29,11 +29,19 @@ end
 
 module MSpecScript::JobServer
   def cores(max = 1)
-    if max > 1 and /(?:\A|\s)--jobserver-(?:auth|fds)=(\d+),(\d+)/ =~ ENV["MAKEFLAGS"]
+    if max > 1 and /(?:\A|\s)--jobserver-(?:auth|fds)=(?:(\d+),(\d+)|fifo:((?:\\.|\S)+))/ =~ ENV["MAKEFLAGS"]
       cores = 1
       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
+          fifo.gsub!(/\\(?=.)/, '')
+          r = File.open(fifo, IO::RDONLY|IO::NONBLOCK|IO::BINARY)
+          w = File.open(fifo, IO::WRONLY|IO::NONBLOCK|IO::BINARY)
+        else
+          r = IO.for_fd($1.to_i(10), "rb", autoclose: false)
+          w = IO.for_fd($2.to_i(10), "wb", autoclose: false)
+        end
+        r.close_on_exec = true
+        w.close_on_exec = true
         jobtokens = r.read_nonblock(max - 1)
         cores = jobtokens.size
         if cores > 0
-- 
cgit v1.2.1