From 44ca2043d03a3d15a4c726e46a47a516700fd44f Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 28 Apr 2015 22:37:27 -0400 Subject: [PATCH] Allow test tmpdir to be passed in --- Library/Homebrew/test/lib/config.rb | 8 ++++++++ Library/Homebrew/test/testing_env.rb | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/lib/config.rb index 63b3e00640..86b652660d 100644 --- a/Library/Homebrew/test/lib/config.rb +++ b/Library/Homebrew/test/lib/config.rb @@ -1,3 +1,11 @@ +require "tmpdir" + +TEST_TMPDIR = ENV.fetch("HOMEBREW_TEST_TMPDIR") { |k| + dir = Dir.mktmpdir("homebrew_tests") + at_exit { FileUtils.remove_entry(dir) } + ENV[k] = dir +} + HOMEBREW_PREFIX = Pathname.new(TEST_TMPDIR).join("prefix") HOMEBREW_REPOSITORY = HOMEBREW_PREFIX HOMEBREW_LIBRARY = HOMEBREW_REPOSITORY+"Library" diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index 8e907e24a2..0e58afeeaa 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -1,11 +1,6 @@ $:.unshift File.expand_path("../..", __FILE__) $:.unshift File.expand_path("../lib", __FILE__) -require "tmpdir" - -TEST_TMPDIR = Dir.mktmpdir("homebrew_tests") -at_exit { FileUtils.remove_entry(TEST_TMPDIR) } - require "global" # Test environment setup