diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-17 00:18:33 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-17 00:18:33 +0000 |
commit | 3947382b87a49a36e247636f5488bf4a00cd1b20 (patch) | |
tree | cbd60f1dddcbf6f6c412c0221d8da4be5ee7766d /spec | |
parent | 0955d9101c37013357ad622678962fb21d7436fa (diff) | |
download | ruby-3947382b87a49a36e247636f5488bf4a00cd1b20.tar.gz |
capi/spec_helper.rb: pass jobserver fds
* 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
Diffstat (limited to 'spec')
-rwxr-xr-x | spec/mspec/lib/mspec/commands/mspec.rb | 2 | ||||
-rw-r--r-- | spec/rubyspec/optional/capi/spec_helper.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/spec/mspec/lib/mspec/commands/mspec.rb b/spec/mspec/lib/mspec/commands/mspec.rb index bd34d5f0da..6b4354c2b0 100755 --- a/spec/mspec/lib/mspec/commands/mspec.rb +++ b/spec/mspec/lib/mspec/commands/mspec.rb @@ -109,7 +109,7 @@ class MSpecMain < MSpecScript } command = argv + ["-fy", "-o", name] $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 diff --git a/spec/rubyspec/optional/capi/spec_helper.rb b/spec/rubyspec/optional/capi/spec_helper.rb index 5dbe6bbcac..3d8cb296a6 100644 --- a/spec/rubyspec/optional/capi/spec_helper.rb +++ b/spec/rubyspec/optional/capi/spec_helper.rb @@ -57,10 +57,9 @@ def compile_extension(name) make = ENV['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 - output = `#{make} V=1 DESTDIR=` + output = IO.popen([make, "V=1", "DESTDIR=", close_others: false], &:read) raise "#{make} failed:\n#{output}" unless $?.success? $stderr.puts output if debug |