aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dev-cmd
diff options
context:
space:
mode:
authorMarkus Reiter2016-10-30 01:41:10 +0200
committerGitHub2016-10-30 01:41:10 +0200
commit5e44184b35dcc099a7a2bb19c42ee48bb3d4e247 (patch)
tree4e46e424dfb8f744d97ec70dee257ae6010d5f10 /Library/Homebrew/dev-cmd
parent9ab38dd751b306ff23fc39f5dca12a24eb1206fc (diff)
parenta9746934fd255072aa2a5768dfe2d2889cd21c85 (diff)
downloadbrew-5e44184b35dcc099a7a2bb19c42ee48bb3d4e247.tar.bz2
Merge pull request #1400 from reitermarkus/move-bundle-path
Move `test/vendor/bundle` to `vendor/bundle`.
Diffstat (limited to 'Library/Homebrew/dev-cmd')
-rw-r--r--Library/Homebrew/dev-cmd/tests.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index 72f8e0375..ee7fa9275 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -26,7 +26,8 @@ module Homebrew
FileUtils.rm_f "test/coverage/.resultset.json"
end
- ENV["BUNDLE_GEMFILE"] = "#{Dir.pwd}/test/Gemfile"
+ ENV["BUNDLE_GEMFILE"] = "#{HOMEBREW_LIBRARY_PATH}/test/Gemfile"
+ ENV["BUNDLE_PATH"] = "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle"
# Override author/committer as global settings might be invalid and thus
# will cause silent failure during the setup of dummy Git repositories.
@@ -37,7 +38,7 @@ module Homebrew
Homebrew.install_gem_setup_path! "bundler"
unless quiet_system("bundle", "check")
- system "bundle", "install", "--path", "vendor/bundle"
+ system "bundle", "install"
end
# Make it easier to reproduce test runs.