diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-08 16:33:39 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-08 17:30:02 +0900 |
| commit | 4aca77edde91f826aa243e268bf1ef5214530583 (patch) | |
| tree | ef0cf1a95fcced00ca5fa40f3412c567bf95d705 /test/rubygems/test_gem_ext_builder.rb | |
| parent | 6a6a24df9b72750d12f9b15192bdb7517e668efb (diff) | |
Merge prepare version of RubyGems 3.2.0
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3864
Diffstat (limited to 'test/rubygems/test_gem_ext_builder.rb')
| -rw-r--r-- | test/rubygems/test_gem_ext_builder.rb | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb index abd33d237a..6e6bf89f9c 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -30,9 +30,8 @@ class TestGemExtBuilder < Gem::TestCase ENV['DESTDIR'] = 'destination' results = [] - Dir.chdir @ext do - File.open 'Makefile', 'w' do |io| - io.puts <<-MAKEFILE + File.open File.join(@ext, 'Makefile'), 'w' do |io| + io.puts <<-MAKEFILE all: \t@#{Gem.ruby} -e "puts %Q{all: \#{ENV['DESTDIR']}}" @@ -41,12 +40,11 @@ clean: install: \t@#{Gem.ruby} -e "puts %Q{install: \#{ENV['DESTDIR']}}" - MAKEFILE - end - - Gem::Ext::Builder.make @dest_path, results + MAKEFILE end + Gem::Ext::Builder.make @dest_path, results, @ext + results = results.join("\n").b assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$}, results @@ -64,20 +62,18 @@ install: ENV['DESTDIR'] = 'destination' results = [] - Dir.chdir @ext do - File.open 'Makefile', 'w' do |io| - io.puts <<-MAKEFILE + File.open File.join(@ext, 'Makefile'), 'w' do |io| + io.puts <<-MAKEFILE all: \t@#{Gem.ruby} -e "puts %Q{all: \#{ENV['DESTDIR']}}" install: \t@#{Gem.ruby} -e "puts %Q{install: \#{ENV['DESTDIR']}}" - MAKEFILE - end - - Gem::Ext::Builder.make @dest_path, results + MAKEFILE end + Gem::Ext::Builder.make @dest_path, results, @ext + results = results.join("\n").b assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$}, results |