aboutsummaryrefslogtreecommitdiffstats
path: root/test/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-07 08:16:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-07 08:16:50 +0000
commit41105b9d2231b5703682e5bf3a858d14b11d1024 (patch)
tree1830fda0e8a81cef9b8ecee1e1e581d6e25f0e7f /test/lib
parente0e3997f28fff2bf927c6bf35860c7fa62722b92 (diff)
downloadruby-41105b9d2231b5703682e5bf3a858d14b11d1024.tar.gz
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
Diffstat (limited to 'test/lib')
-rw-r--r--test/lib/test/unit.rb2
1 files changed, 1 insertions, 1 deletions
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)