kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

capi/spec_helper.rb: pass jobserver fds

Browse source 
* spec/mspec/lib/mspec/commands/mspec.rb (MSpecMain#multi_exec):
  do not close GNU make jobserver auth fds.

* spec/rubyspec/optional/capi/spec_helper.rb (compile_extension):
  ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-06-17 00:18:33 +00:00
parent 0955d9101c
commit 3947382b87
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/mspec/lib/mspec/commands/mspec.rb
View file

@ -109,7 +109,7 @@ class MSpecMain < MSpecScript
} }
command = argv + ["-fy", "-o", name] command = argv + ["-fy", "-o", name]
$stderr.puts "$ #{command.join(' ')}" if $MSPEC_DEBUG $stderr.puts "$ #{command.join(' ')}" if $MSPEC_DEBUG
IO.popen([env, *command], "rb+") IO.popen([env, *command, close_others: false], "rb+")
} }
puts children.map { |child| child.gets }.uniq puts children.map { |child| child.gets }.uniq

3
spec/rubyspec/optional/capi/spec_helper.rb
View file

@ -57,10 +57,9 @@ def compile_extension(name)
make = ENV['MAKE'] make = ENV['MAKE']
make ||= (RbConfig::CONFIG['host_os'].include?("mswin") ? "nmake" : "make") make ||= (RbConfig::CONFIG['host_os'].include?("mswin") ? "nmake" : "make")
ENV.delete "MAKEFLAGS" # Fix make warning when invoked with -j in MRI
# Do not capture stderr as we want to show compiler warnings # Do not capture stderr as we want to show compiler warnings
output = `#{make} V=1 DESTDIR=` output = IO.popen([make, "V=1", "DESTDIR=", close_others: false], &:read)
raise "#{make} failed:\n#{output}" unless $?.success? raise "#{make} failed:\n#{output}" unless $?.success?
$stderr.puts output if debug $stderr.puts output if debug