From 326a71712fe5a7e90f0d019a610b173eee7ff37c Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 27 Sep 2024 01:55:26 +0100 Subject: [PATCH] Revert "Shorten `brew tests` temporary paths." This reverts commit 27fb07c0fc622d3e010a8a9f6e0056fd09dc5b1f. --- Library/Homebrew/test/support/lib/startup/config.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/test/support/lib/startup/config.rb b/Library/Homebrew/test/support/lib/startup/config.rb index 6891a9a11b..8bbba31ea3 100644 --- a/Library/Homebrew/test/support/lib/startup/config.rb +++ b/Library/Homebrew/test/support/lib/startup/config.rb @@ -5,9 +5,8 @@ raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!" unle HOMEBREW_BREW_FILE = Pathname.new(ENV.fetch("HOMEBREW_BREW_FILE")).freeze -homebrew_temp = ENV.fetch("HOMEBREW_TEMP") TEST_TMPDIR = ENV.fetch("HOMEBREW_TEST_TMPDIR") do |k| - dir = Dir.mktmpdir("homebrew-tests-", homebrew_temp) + dir = Dir.mktmpdir("homebrew-tests-", ENV.fetch("HOMEBREW_TEMP")) at_exit do # Child processes inherit this at_exit handler, but we don't want them # to clean TEST_TMPDIR up prematurely (i.e. when they exit early for a test). @@ -16,13 +15,6 @@ TEST_TMPDIR = ENV.fetch("HOMEBREW_TEST_TMPDIR") do |k| ENV[k] = dir end.freeze -# Use a shorter HOMEBREW_TEMP path so Sequoia doesn't error out as often on long paths (> 104 bytes). -# Use the minimal amount of randomness to avoid collisions while allowing parallel tests. -require "securerandom" -random_hex = SecureRandom.hex(2) -HOMEBREW_TEMP = Pathname("#{homebrew_temp}/brewtests#{random_hex}".squeeze("/")).freeze -HOMEBREW_TEMP.mkpath - # Paths pointing into the Homebrew code base that persist across test runs HOMEBREW_SHIMS_PATH = (HOMEBREW_LIBRARY_PATH/"shims").freeze @@ -40,6 +32,7 @@ HOMEBREW_PINNED_KEGS = (HOMEBREW_PREFIX.parent/"pinned").freeze HOMEBREW_LOCKS = (HOMEBREW_PREFIX.parent/"locks").freeze HOMEBREW_CELLAR = (HOMEBREW_PREFIX.parent/"cellar").freeze HOMEBREW_LOGS = (HOMEBREW_PREFIX.parent/"logs").freeze +HOMEBREW_TEMP = (HOMEBREW_PREFIX.parent/"temp").freeze HOMEBREW_TAP_DIRECTORY = (HOMEBREW_LIBRARY/"Taps").freeze HOMEBREW_RUBY_EXEC_ARGS = [ RUBY_PATH,