mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

dev-cmd/tests: fix require ordering.

Browse Source 
This needs to happen after `setup_environment!` so that
`HOMEBREW_TEST_GENERIC_OS` is set and `OS.linux?` and `OS.mac?` both
`return false`.
This commit is contained in:
Mike McQuaid 2025-06-12 13:07:27 +01:00
parent a63baa62d2
commit f234423913
No known key found for this signature in database
3 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Library/Homebrew/dev-cmd/tests.rb
View File

@ -51,6 +51,11 @@ module Homebrew
HOMEBREW_LIBRARY_PATH.cd do HOMEBREW_LIBRARY_PATH.cd do
setup_environment! setup_environment!
# Needs required here, after `setup_environment!`, so that
# `HOMEBREW_TEST_GENERIC_OS` is set and `OS.linux?` and `OS.mac?` both
# `return false`.
require "extend/os/dev-cmd/tests"
parallel = !args.no_parallel? parallel = !args.no_parallel?
only = args.only only = args.only
@ -127,8 +132,8 @@ module Homebrew
bundle_args << "--tag" << "~needs_network" unless args.online? bundle_args << "--tag" << "~needs_network" unless args.online?
bundle_args << "--tag" << "~needs_ci" unless ENV["CI"] bundle_args << "--tag" << "~needs_ci" unless ENV["CI"]
bundle_args = os_bundle_args(bundle_args, generic: args.generic?) bundle_args = os_bundle_args(bundle_args)
files = os_files(files, generic: args.generic?) files = os_files(files)
puts "Randomized with seed #{seed}" puts "Randomized with seed #{seed}"
@ -156,12 +161,11 @@ module Homebrew
private private
sig { params(bundle_args: T::Array[String], generic: T::Boolean).returns(T::Array[String]) } sig { params(bundle_args: T::Array[String]).returns(T::Array[String]) }
def os_bundle_args(bundle_args, generic:) def os_bundle_args(bundle_args)
# for generic tests, remove macOS or Linux specific tests # for generic tests, remove macOS or Linux specific tests
non_linux_bundle_args(non_macos_bundle_args(bundle_args)) non_linux_bundle_args(non_macos_bundle_args(bundle_args))
end end
alias generic_os_bundle_args os_bundle_args
sig { params(bundle_args: T::Array[String]).returns(T::Array[String]) } sig { params(bundle_args: T::Array[String]).returns(T::Array[String]) }
def non_macos_bundle_args(bundle_args) def non_macos_bundle_args(bundle_args)
@ -176,12 +180,11 @@ module Homebrew
bundle_args << "--tag" << "~needs_linux" << "--tag" << "~needs_systemd" bundle_args << "--tag" << "~needs_linux" << "--tag" << "~needs_systemd"
end end
sig { params(files: T::Array[String], generic: T::Boolean).returns(T::Array[String]) } sig { params(files: T::Array[String]).returns(T::Array[String]) }
def os_files(files, generic:) def os_files(files)
# for generic tests, remove macOS or Linux specific files # for generic tests, remove macOS or Linux specific files
non_linux_files(non_macos_files(files)) non_linux_files(non_macos_files(files))
end end
alias generic_os_files os_files
sig { params(files: T::Array[String]).returns(T::Array[String]) } sig { params(files: T::Array[String]).returns(T::Array[String]) }
def non_macos_files(files) def non_macos_files(files)
@ -269,5 +272,3 @@ module Homebrew
end end
end end
end end
require "extend/os/dev-cmd/tests"

12
Library/Homebrew/extend/os/linux/dev-cmd/tests.rb
View File

@ -11,17 +11,13 @@ module OS
private private
sig { params(bundle_args: T::Array[String], generic: T::Boolean).returns(T::Array[String]) } sig { params(bundle_args: T::Array[String]).returns(T::Array[String]) }
def os_bundle_args(bundle_args, generic:) def os_bundle_args(bundle_args)
return generic_os_bundle_args(bundle_args, generic:) if generic
non_macos_bundle_args(bundle_args) non_macos_bundle_args(bundle_args)
end end
sig { params(files: T::Array[String], generic: T::Boolean).returns(T::Array[String]) } sig { params(files: T::Array[String]).returns(T::Array[String]) }
def os_files(files, generic:) def os_files(files)
return generic_os_files(files, generic:) if generic
non_macos_files(files) non_macos_files(files)
end end
end end

12
Library/Homebrew/extend/os/mac/dev-cmd/tests.rb
View File

@ -11,17 +11,13 @@ module OS
private private
sig { params(bundle_args: T::Array[String], generic: T::Boolean).returns(T::Array[String]) } sig { params(bundle_args: T::Array[String]).returns(T::Array[String]) }
def os_bundle_args(bundle_args, generic:) def os_bundle_args(bundle_args)
return generic_os_bundle_args(bundle_args, generic:) if generic
non_linux_bundle_args(bundle_args) non_linux_bundle_args(bundle_args)
end end
sig { params(files: T::Array[String], generic: T::Boolean).returns(T::Array[String]) } sig { params(files: T::Array[String]).returns(T::Array[String]) }
def os_files(files, generic:) def os_files(files)
return generic_os_files(files, generic:) if generic
non_linux_files(files) non_linux_files(files)
end end
end end