diff options
| author | Mike McQuaid | 2017-05-07 17:31:09 +0100 |
|---|---|---|
| committer | GitHub | 2017-05-07 17:31:09 +0100 |
| commit | 0d5956948e597efd4186fbc590fa664f9ed6f429 (patch) | |
| tree | c7f61167ec6e0599a16a80986acafd2da1938b0b /Library/Homebrew/test/support/lib | |
| parent | 8d948e4b0b55912c592d34cb5ea83c649b1f9d5e (diff) | |
| parent | 57db2e539eaa5fbae351963265312bd24ed08f6b (diff) | |
| download | brew-0d5956948e597efd4186fbc590fa664f9ed6f429.tar.bz2 | |
Merge pull request #2606 from MikeMcQuaid/revert-vendor-gems
Revert gem vendoring experiment.
Diffstat (limited to 'Library/Homebrew/test/support/lib')
| -rw-r--r-- | Library/Homebrew/test/support/lib/config.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Library/Homebrew/test/support/lib/config.rb b/Library/Homebrew/test/support/lib/config.rb index 41f4cbe33..3a0a76722 100644 --- a/Library/Homebrew/test/support/lib/config.rb +++ b/Library/Homebrew/test/support/lib/config.rb @@ -2,6 +2,8 @@ unless ENV["HOMEBREW_BREW_FILE"] raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!" end +require "constants" + require "tmpdir" require "pathname" @@ -14,9 +16,9 @@ TEST_TMPDIR = ENV.fetch("HOMEBREW_TEST_TMPDIR") do |k| end # Paths pointing into the Homebrew code base that persist across test runs -HOMEBREW_LIBRARY_PATH = Pathname.new(File.expand_path("../../../..", __FILE__)) -HOMEBREW_SHIMS_PATH = HOMEBREW_LIBRARY_PATH.parent+"Homebrew/shims" -HOMEBREW_LOAD_PATH = [File.expand_path("..", __FILE__), HOMEBREW_LIBRARY_PATH, ENV["HOMEBREW_GEMS_LOAD_PATH"]].join(":") +HOMEBREW_LIBRARY_PATH = Pathname.new(File.expand_path("../../../..", __FILE__)) +HOMEBREW_SHIMS_PATH = HOMEBREW_LIBRARY_PATH.parent+"Homebrew/shims" +HOMEBREW_LOAD_PATH = [File.expand_path("..", __FILE__), HOMEBREW_LIBRARY_PATH].join(":") # Paths redirected to a temporary directory and wiped at the end of the test run HOMEBREW_PREFIX = Pathname.new(TEST_TMPDIR).join("prefix") |