diff options
Diffstat (limited to 'Library/Homebrew/test/testing_env.rb')
| -rw-r--r-- | Library/Homebrew/test/testing_env.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index 1e3f917b0..fc5d80441 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -1,7 +1,6 @@ # Require this file to build a testing environment. -repo_root = Pathname.new File.expand_path("../../../..", __FILE__) -$: << repo_root.join("Library", "Homebrew").to_s +$:.push(File.expand_path(__FILE__+'/../..')) require 'extend/module' require 'extend/fileutils' @@ -20,10 +19,8 @@ at_exit { FileUtils.remove_entry(TEST_TMPDIR) } # Constants normally defined in global.rb HOMEBREW_PREFIX = Pathname.new(TEST_TMPDIR).join("prefix") -HOMEBREW_REPOSITORY = repo_root -HOMEBREW_BREW_FILE = HOMEBREW_REPOSITORY+"bin"+"brew" +HOMEBREW_REPOSITORY = HOMEBREW_PREFIX HOMEBREW_LIBRARY = HOMEBREW_REPOSITORY+'Library' -HOMEBREW_LIBRARY_PATH = HOMEBREW_LIBRARY+"Homebrew" HOMEBREW_CACHE = HOMEBREW_PREFIX.parent+'cache' HOMEBREW_CACHE_FORMULA = HOMEBREW_PREFIX.parent+'formula_cache' HOMEBREW_CELLAR = HOMEBREW_PREFIX.parent+'cellar' @@ -51,7 +48,8 @@ MACOS_VERSION = ENV.fetch('MACOS_VERSION') { MACOS_FULL_VERSION[/10\.\d+/] } ORIGINAL_PATHS = ENV['PATH'].split(File::PATH_SEPARATOR).map{ |p| Pathname.new(p).expand_path rescue nil }.compact.freeze # Test environment setup -%w{prefix cache formula_cache cellar logs}.each { |d| HOMEBREW_PREFIX.parent.join(d).mkpath } +%w{ENV Formula}.each { |d| HOMEBREW_LIBRARY.join(d).mkpath } +%w{cache formula_cache cellar logs}.each { |d| HOMEBREW_PREFIX.parent.join(d).mkpath } # Test fixtures and files can be found relative to this path TEST_DIRECTORY = File.dirname(File.expand_path(__FILE__)) |