summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rw-r--r--spec/bundler/spec_helper.rb12
-rw-r--r--spec/bundler/support/path.rb2
2 files changed, 13 insertions, 1 deletions
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