diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-15 00:59:35 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-15 00:59:35 +0000 |
commit | 92e3ffdf780728719125c64709a6b2fb95185e71 (patch) | |
tree | 7b083185f5bff1ab385c7b493bb35421741ecdb4 /spec | |
parent | 3ce856a602d3c79070e9c516f1be4dd053d54499 (diff) | |
download | ruby-92e3ffdf780728719125c64709a6b2fb95185e71.tar.gz |
rubyspec: jobserver fd may not be available
* spec/rubyspec/optional/capi/spec_helper.rb (compile_extension):
rescue possible EBADF as jobserver fd may not be available.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec')
-rw-r--r-- | spec/rubyspec/optional/capi/spec_helper.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/spec/rubyspec/optional/capi/spec_helper.rb b/spec/rubyspec/optional/capi/spec_helper.rb index 90ed86d391..b82ce69b0e 100644 --- a/spec/rubyspec/optional/capi/spec_helper.rb +++ b/spec/rubyspec/optional/capi/spec_helper.rb @@ -57,17 +57,21 @@ def compile_extension(name) make = ENV['MAKE'] make ||= (RbConfig::CONFIG['host_os'].include?("mswin") ? "nmake" : "make") - if File.basename(make, ".*") == "nmake" + if File.basename(make, ".*").casecmp?("nmake") # suppress logo of nmake.exe to stderr ENV["MAKEFLAGS"] = "l#{ENV["MAKEFLAGS"]}" end opts = {} if /(?:\A|\s)--jobserver-(?:auth|fds)=(\d+),(\d+)/ =~ ENV["MAKEFLAGS"] - r = IO.for_fd($1.to_i(10), "rb", autoclose: false) - w = IO.for_fd($2.to_i(10), "wb", autoclose: false) - opts[r] = r - opts[w] = w + begin + r = IO.for_fd($1.to_i(10), "rb", autoclose: false) + w = IO.for_fd($2.to_i(10), "wb", autoclose: false) + rescue Errno::EBADF + else + opts[r] = r + opts[w] = w + end end # Do not capture stderr as we want to show compiler warnings output = IO.popen([make, "V=1", "DESTDIR=", opts], &:read) |