From f234423913bad1f76d23ddb1dfc328085aa91896 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 12 Jun 2025 13:07:27 +0100
Subject: [PATCH] dev-cmd/tests: fix require ordering.

This needs to happen after `setup_environment!` so that
`HOMEBREW_TEST_GENERIC_OS` is set and `OS.linux?` and `OS.mac?` both
`return false`.
---
 Library/Homebrew/dev-cmd/tests.rb             | 21 ++++++++++---------
 .../Homebrew/extend/os/linux/dev-cmd/tests.rb | 12 ++++-------
 .../Homebrew/extend/os/mac/dev-cmd/tests.rb   | 12 ++++-------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index 7865226e0f..182c00241f 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -51,6 +51,11 @@ module Homebrew
         HOMEBREW_LIBRARY_PATH.cd do
           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?
 
           only = args.only
@@ -127,8 +132,8 @@ module Homebrew
           bundle_args << "--tag" << "~needs_network" unless args.online?
           bundle_args << "--tag" << "~needs_ci" unless ENV["CI"]
 
-          bundle_args = os_bundle_args(bundle_args, generic: args.generic?)
-          files = os_files(files, generic: args.generic?)
+          bundle_args = os_bundle_args(bundle_args)
+          files = os_files(files)
 
           puts "Randomized with seed #{seed}"
 
@@ -156,12 +161,11 @@ module Homebrew
 
       private
 
-      sig { params(bundle_args: T::Array[String], generic: T::Boolean).returns(T::Array[String]) }
-      def os_bundle_args(bundle_args, generic:)
+      sig { params(bundle_args: T::Array[String]).returns(T::Array[String]) }
+      def os_bundle_args(bundle_args)
         # for generic tests, remove macOS or Linux specific tests
         non_linux_bundle_args(non_macos_bundle_args(bundle_args))
       end
-      alias generic_os_bundle_args os_bundle_args
 
       sig { params(bundle_args: T::Array[String]).returns(T::Array[String]) }
       def non_macos_bundle_args(bundle_args)
@@ -176,12 +180,11 @@ module Homebrew
         bundle_args << "--tag" << "~needs_linux" << "--tag" << "~needs_systemd"
       end
 
-      sig { params(files: T::Array[String], generic: T::Boolean).returns(T::Array[String]) }
-      def os_files(files, generic:)
+      sig { params(files: T::Array[String]).returns(T::Array[String]) }
+      def os_files(files)
         # for generic tests, remove macOS or Linux specific files
         non_linux_files(non_macos_files(files))
       end
-      alias generic_os_files os_files
 
       sig { params(files: T::Array[String]).returns(T::Array[String]) }
       def non_macos_files(files)
@@ -269,5 +272,3 @@ module Homebrew
     end
   end
 end
-
-require "extend/os/dev-cmd/tests"
diff --git a/Library/Homebrew/extend/os/linux/dev-cmd/tests.rb b/Library/Homebrew/extend/os/linux/dev-cmd/tests.rb
index 642cf24f2c..60bc593254 100644
--- a/Library/Homebrew/extend/os/linux/dev-cmd/tests.rb
+++ b/Library/Homebrew/extend/os/linux/dev-cmd/tests.rb
@@ -11,17 +11,13 @@ module OS
 
         private
 
-        sig { params(bundle_args: T::Array[String], generic: T::Boolean).returns(T::Array[String]) }
-        def os_bundle_args(bundle_args, generic:)
-          return generic_os_bundle_args(bundle_args, generic:) if generic
-
+        sig { params(bundle_args: T::Array[String]).returns(T::Array[String]) }
+        def os_bundle_args(bundle_args)
           non_macos_bundle_args(bundle_args)
         end
 
-        sig { params(files: T::Array[String], generic: T::Boolean).returns(T::Array[String]) }
-        def os_files(files, generic:)
-          return generic_os_files(files, generic:) if generic
-
+        sig { params(files: T::Array[String]).returns(T::Array[String]) }
+        def os_files(files)
           non_macos_files(files)
         end
       end
diff --git a/Library/Homebrew/extend/os/mac/dev-cmd/tests.rb b/Library/Homebrew/extend/os/mac/dev-cmd/tests.rb
index bd9c03fe1b..6b03ba3ccf 100644
--- a/Library/Homebrew/extend/os/mac/dev-cmd/tests.rb
+++ b/Library/Homebrew/extend/os/mac/dev-cmd/tests.rb
@@ -11,17 +11,13 @@ module OS
 
         private
 
-        sig { params(bundle_args: T::Array[String], generic: T::Boolean).returns(T::Array[String]) }
-        def os_bundle_args(bundle_args, generic:)
-          return generic_os_bundle_args(bundle_args, generic:) if generic
-
+        sig { params(bundle_args: T::Array[String]).returns(T::Array[String]) }
+        def os_bundle_args(bundle_args)
           non_linux_bundle_args(bundle_args)
         end
 
-        sig { params(files: T::Array[String], generic: T::Boolean).returns(T::Array[String]) }
-        def os_files(files, generic:)
-          return generic_os_files(files, generic:) if generic
-
+        sig { params(files: T::Array[String]).returns(T::Array[String]) }
+        def os_files(files)
           non_linux_files(files)
         end
       end