From 852aa7798ff25c7ce50bdf7477f724fbc624662b Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Thu, 15 Aug 2024 11:26:45 -0700
Subject: [PATCH] [build-script] Fix product dependencies

SwiftPM now depends on `SwiftTesting`, `SwiftTesting` depends on
`SwiftTestingMacros`

rdar://133946466
---
 .../swift_build_support/build_script_invocation.py        | 8 ++++----
 .../swift_build_support/products/swift_testing.py         | 4 +++-
 .../swift_build_support/products/swiftpm.py               | 4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/utils/swift_build_support/swift_build_support/build_script_invocation.py b/utils/swift_build_support/swift_build_support/build_script_invocation.py
index 75d393edee695..15c90dd55d2b1 100644
--- a/utils/swift_build_support/swift_build_support/build_script_invocation.py
+++ b/utils/swift_build_support/swift_build_support/build_script_invocation.py
@@ -670,6 +670,10 @@ def compute_product_pipelines(self):
         builder.add_product(products.WasmSwiftSDK,
                             is_enabled=self.args.build_wasmstdlib)
 
+        builder.add_product(products.SwiftTestingMacros,
+                            is_enabled=self.args.build_swift_testing_macros)
+        builder.add_product(products.SwiftTesting,
+                            is_enabled=self.args.build_swift_testing)
         builder.add_product(products.SwiftPM,
                             is_enabled=self.args.build_swiftpm)
         builder.add_product(products.SwiftFoundationTests,
@@ -678,10 +682,6 @@ def compute_product_pipelines(self):
                             is_enabled=self.args.build_foundation)
         builder.add_product(products.SwiftSyntax,
                             is_enabled=self.args.build_swiftsyntax)
-        builder.add_product(products.SwiftTestingMacros,
-                            is_enabled=self.args.build_swift_testing_macros)
-        builder.add_product(products.SwiftTesting,
-                            is_enabled=self.args.build_swift_testing)
         builder.add_product(products.SwiftFormat,
                             is_enabled=self.args.build_swiftformat)
         builder.add_product(products.SKStressTester,
diff --git a/utils/swift_build_support/swift_build_support/products/swift_testing.py b/utils/swift_build_support/swift_build_support/products/swift_testing.py
index 0e96f71f14c06..474724baddb0e 100644
--- a/utils/swift_build_support/swift_build_support/products/swift_testing.py
+++ b/utils/swift_build_support/swift_build_support/products/swift_testing.py
@@ -17,6 +17,7 @@
 from . import cmake_product
 from . import product
 from . import swift
+from . import swift_testing_macros
 
 
 class SwiftTesting(product.Product):
@@ -34,7 +35,8 @@ def product_source_name(cls):
 
     @classmethod
     def get_dependencies(cls):
-        return [swift.Swift]
+        return [swift.Swift,
+                swift_testing_macros.SwiftTestingMacros]
 
     def should_build(self, host_target):
         return True
diff --git a/utils/swift_build_support/swift_build_support/products/swiftpm.py b/utils/swift_build_support/swift_build_support/products/swiftpm.py
index e0fba6c8546ad..cb82f21c681c9 100644
--- a/utils/swift_build_support/swift_build_support/products/swiftpm.py
+++ b/utils/swift_build_support/swift_build_support/products/swiftpm.py
@@ -20,6 +20,7 @@
 from . import llvm
 from . import product
 from . import swift
+from . import swift_testing
 from . import xctest
 from .. import shell
 from ..targets import StdlibDeploymentTarget
@@ -141,4 +142,5 @@ def get_dependencies(cls):
                 libdispatch.LibDispatch,
                 foundation.Foundation,
                 xctest.XCTest,
-                llbuild.LLBuild]
+                llbuild.LLBuild,
+                swift_testing.SwiftTesting]