diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-05-30 20:25:29 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-05-30 21:50:07 +0900 |
| commit | 4bbeed61346d6016e2d72818e8068bedcb9f006d (patch) | |
| tree | ddf1b23eb0e63a47efa8cc1fc0b72652e3dac354 /test | |
| parent | 30b960ba345fd462f98db204f47bba66819d9884 (diff) | |
Merge RubyGems/Bundler master from 4076391fce5847689bf2ec402b17133fe4e32285
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/7873
Diffstat (limited to 'test')
| -rw-r--r-- | test/rubygems/test_gem_commands_setup_command.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_ext_cargo_builder.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem_gem_runner.rb | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index cd94f61247..6859d7a5cb 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -18,7 +18,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase @cmd.options[:document] = [] filelist = %w[ - bin/gem + exe/gem lib/rubygems.rb lib/rubygems/requirement.rb lib/rubygems/ssl_certs/rubygems.org/foo.pem diff --git a/test/rubygems/test_gem_ext_cargo_builder.rb b/test/rubygems/test_gem_ext_cargo_builder.rb index ed2290463f..0d893f5424 100644 --- a/test/rubygems/test_gem_ext_cargo_builder.rb +++ b/test/rubygems/test_gem_ext_cargo_builder.rb @@ -100,7 +100,7 @@ class TestGemExtCargoBuilder < Gem::TestCase require "tmpdir" env_for_subprocess = @rust_envs.merge("GEM_HOME" => Gem.paths.home) - gem = [env_for_subprocess, *ruby_with_rubygems_in_load_path, File.expand_path("../../bin/gem", __dir__)] + gem = [env_for_subprocess, *ruby_with_rubygems_in_load_path, File.expand_path("../../exe/gem", __dir__)] Dir.mktmpdir("rust_ruby_example") do |dir| built_gem = File.expand_path(File.join(dir, "rust_ruby_example.gem")) @@ -122,7 +122,7 @@ class TestGemExtCargoBuilder < Gem::TestCase require "tmpdir" env_for_subprocess = @rust_envs.merge("GEM_HOME" => Gem.paths.home) - gem = [env_for_subprocess, *ruby_with_rubygems_in_load_path, File.expand_path("../../bin/gem", __dir__)] + gem = [env_for_subprocess, *ruby_with_rubygems_in_load_path, File.expand_path("../../exe/gem", __dir__)] Dir.mktmpdir("custom_name") do |dir| built_gem = File.expand_path(File.join(dir, "custom_name.gem")) diff --git a/test/rubygems/test_gem_gem_runner.rb b/test/rubygems/test_gem_gem_runner.rb index 3257c4bd72..5a3f5fe9f4 100644 --- a/test/rubygems/test_gem_gem_runner.rb +++ b/test/rubygems/test_gem_gem_runner.rb @@ -4,9 +4,6 @@ require_relative "helper" class TestGemGemRunner < Gem::TestCase def setup - @orig_gem_home = ENV["GEM_HOME"] - ENV["GEM_HOME"] = @gemhome - require "rubygems/command" @orig_args = Gem::Command.build_args @orig_specific_extra_args = Gem::Command.specific_extra_args_hash.dup @@ -24,8 +21,6 @@ class TestGemGemRunner < Gem::TestCase Gem::Command.build_args = @orig_args Gem::Command.specific_extra_args_hash = @orig_specific_extra_args Gem::Command.extra_args = @orig_extra_args - - ENV["GEM_HOME"] = @orig_gem_home end def test_do_configuration |