From 7511130721169c4ade7fb15bbbb9a6d8218706d3 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 7 Feb 2017 08:16:50 +0000 Subject: test/unit.rb: old GNU make * test/lib/test/unit.rb (Test::Unit::Parallel#non_options): support old GNU make, which uses --jobserver-fds option instead of --jobserver-auth. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/lib/test/unit.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb index 03c56d825a..6cb22e725a 100644 --- a/test/lib/test/unit.rb +++ b/test/lib/test/unit.rb @@ -140,7 +140,7 @@ module Test def non_options(files, options) @jobserver = nil if !options[:parallel] and - /(?:\A|\s)--jobserver-auth=(\d+),(\d+)/ =~ ENV["MAKEFLAGS"] + /(?:\A|\s)--jobserver-(?:auth|fds)=(\d+),(\d+)/ =~ ENV["MAKEFLAGS"] begin r = IO.for_fd($1.to_i(10), "rb", autoclose: false) w = IO.for_fd($2.to_i(10), "wb", autoclose: false) -- cgit v1.2.3