[前][次][番号順一覧][スレッド一覧]

ruby-changes:72167

From: David <ko1@a...>
Date: Wed, 15 Jun 2022 21:11:06 +0900 (JST)
Subject: [ruby-changes:72167] d417c1ddc5 (master): [rubygems/rubygems] Revert "Support running specs with asdf version manager"

https://git.ruby-lang.org/ruby.git/commit/?id=d417c1ddc5

From d417c1ddc51c521ccc7b85c6cc9410470949e3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Wed, 15 Jun 2022 12:42:12 +0200
Subject: [rubygems/rubygems] Revert "Support running specs with asdf version
 manager"

This reverts commit https://github.com/rubygems/rubygems/commit/4b2d09af5bc7.

https://github.com/rubygems/rubygems/commit/90ca7a7163
---
 spec/bundler/spec_helper.rb | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/spec/bundler/spec_helper.rb b/spec/bundler/spec_helper.rb
index 5f9ed0ec0a..23db133b67 100644
--- a/spec/bundler/spec_helper.rb
+++ b/spec/bundler/spec_helper.rb
@@ -78,19 +78,10 @@ RSpec.configure do |config| https://github.com/ruby/ruby/blob/trunk/spec/bundler/spec_helper.rb#L78
     ENV["XDG_CONFIG_HOME"] = nil
     ENV["GEMRC"] = nil
 
-    extend(Spec::Helpers)
-
-    # Ruby-core needs RUBYLIB set, leave any "internal" RUBYLIB entries to avoid
-    # resetting that, but reset anything else to avoid external stuff like asdf
-    # hooks from interfering with our specs
-
-    rubylib = ENV["RUBYLIB"]
-    rubylib = rubylib.split(File::PATH_SEPARATOR).select {|p| p.start_with?(git_root.to_s) }.join(File::PATH_SEPARATOR) if rubylib
-    ENV["RUBYLIB"] = rubylib
-
     # Don't wrap output in tests
     ENV["THOR_COLUMNS"] = "10000"
 
+    extend(Spec::Helpers)
     system_gems :bundler, :path => pristine_system_gem_path
   end
 
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]