Merge #6743

6743: Support file structure of ruby core repository. r=hsbt a=hsbt

In the ruby core repository, I put bundler executable and bundler libraries under the `bin` and `lib` directories. It breaks the current behavior.

Support the structure of ruby core repository.

Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
(cherry picked from commit 172ec59db53ec05a91c0d9eb72e2d715ae82f3c0)

3 files changed, 5 insertions, 5 deletions

diff --git a/spec/install/gems/native_extensions_spec.rb b/spec/install/gems/native_extensions_spec.rb
index c8252b81f1..ea616f60d3 100644
--- a/spec/install/gems/native_extensions_spec.rb
+++ b/spec/install/gems/native_extensions_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "installing a gem with native extensions" do
+RSpec.describe "installing a gem with native extensions", :ruby_repo do
   it "installs" do
     build_repo2 do
       build_gem "c_extension" do |s|
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb
index e58f32836c..01c03ac793 100644
--- a/spec/install/gems/resolving_spec.rb
+++ b/spec/install/gems/resolving_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe "bundle install with install-time dependencies" do
-  it "installs gems with implicit rake dependencies" do
+  it "installs gems with implicit rake dependencies", :ruby_repo do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
       gem "with_implicit_rake_dep"
@@ -48,7 +48,7 @@ RSpec.describe "bundle install with install-time dependencies" do
       expect(the_bundle).to include_gems "net_b 1.0"
     end
 
-    it "installs plugins depended on by other plugins" do
+    it "installs plugins depended on by other plugins", :ruby_repo do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
         gem "net_a"
@@ -57,7 +57,7 @@ RSpec.describe "bundle install with install-time dependencies" do
       expect(the_bundle).to include_gems "net_a 1.0", "net_b 1.0"
     end
 
-    it "installs multiple levels of dependencies" do
+    it "installs multiple levels of dependencies", :ruby_repo do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
         gem "net_c"
diff --git a/spec/install/gems/standalone_spec.rb b/spec/install/gems/standalone_spec.rb
index eecf6f2e7e..fa7a3bdc27 100644
--- a/spec/install/gems/standalone_spec.rb
+++ b/spec/install/gems/standalone_spec.rb
@@ -67,7 +67,7 @@ RSpec.shared_examples "bundle install --standalone" do
     include_examples "common functionality"
   end
 
-  describe "with gems with native extension" do
+  describe "with gems with native extension", :ruby_repo do
     before do
       install_gemfile <<-G, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => true)
         source "file://#{gem_repo1}"