From a94332819463589fe4537cc62beb41a0ee354cf3 Mon Sep 17 00:00:00 2001 From: hsbt Date: Sun, 25 Nov 2018 01:20:00 +0000 Subject: Use stub executables generated by RubyGems istead of original executables. It resolved the conflict issues when invoking `gem i rdoc` and the binstub issues with Bundler and Rails. [Bug #5060][ruby-core:38257][Fix GH-2023] * https://github.com/rubygems/rubygems/pull/2338 * https://github.com/heroku/heroku-buildpack-ruby/issues/829 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/bundler/spec_helper.rb | 12 ++++++++++++ spec/bundler/support/path.rb | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/bundler/spec_helper.rb b/spec/bundler/spec_helper.rb index ff009e773f..c7614e1c43 100644 --- a/spec/bundler/spec_helper.rb +++ b/spec/bundler/spec_helper.rb @@ -131,6 +131,12 @@ RSpec.configure do |config| Gem.ruby = orig_ruby if ENV["BUNDLE_RUBY"] end + config.before :suite do + if ENV["BUNDLE_RUBY"] + FileUtils.cp_r Spec::Path.bindir, File.join(Spec::Path.root, "lib", "exe") + end + end + config.before :all do build_repo1 end @@ -155,4 +161,10 @@ RSpec.configure do |config| Dir.chdir(original_wd) ENV.replace(original_env) end + + config.after :suite do + if ENV["BUNDLE_RUBY"] + FileUtils.rm_rf File.join(Spec::Path.root, "lib", "exe") + end + end end diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb index 97153226bd..03a96893f3 100644 --- a/spec/bundler/support/path.rb +++ b/spec/bundler/support/path.rb @@ -13,7 +13,7 @@ module Spec end def bindir - @bindir ||= root.join(ruby_core? ? "bin" : "exe") + @bindir ||= root.join(ruby_core? ? "libexec" : "exe") end def spec_dir -- cgit v1.2.3