From f863d61374902553623ad10b20392bf3274f137a Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Sat, 29 Oct 2016 15:31:47 +0200
Subject: Move `vendor/bundle` up one level to `HOMEBREW_LIBRARY_PATH`.

---
 Library/Homebrew/dev-cmd/tests.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Library/Homebrew/dev-cmd')

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.
-- 
cgit v1.2.3