From 48bd486a0165dde65471799ab4dd960646d4af58 Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Tue, 30 Jul 2024 11:23:21 -0700
Subject: [PATCH 1/2] [Windows/Android] Add swift-testing

(cherry picked from commit 852784acd58cf2ce2f490c9654fd0f0b52a8cd6e)
---
 platforms/Windows/bld/bld.wxs |  3 +++
 platforms/Windows/sdk/sdk.wxs | 38 ++++++++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
index a955d0a1..7b226577 100644
--- a/platforms/Windows/bld/bld.wxs
+++ b/platforms/Windows/bld/bld.wxs
@@ -324,6 +324,9 @@
       <Component>
         <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftMacros.dll" />
       </Component>
+      <Component>
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="FoundationMacros" Directory="_usr_bin">
diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs
index 6348808e..c4c0152b 100644
--- a/platforms/Windows/sdk/sdk.wxs
+++ b/platforms/Windows/sdk/sdk.wxs
@@ -34,7 +34,9 @@
               └─ Windows.platform
                   └─ Developer
                       ├─ Library
-                      │   └─ XCTest-development
+                      │   ├─ XCTest-development
+                      │   │   └─ ...
+                      │   └─ Testing-development
                       │       └─ ...
                       └─ SDKs
                           └─ Windows.sdk
@@ -44,11 +46,11 @@
       <Directory Id="WindowsPlatform" Name="Windows.platform">
         <Directory Name="Developer">
           <Directory Name="Library">
-            <!-- XCTest -->
             <!--
               FIXME(compnerd) this should actually be the proper version
-              of XCTest, and needs to be reflected in the plist as well.
+              of XCTest and Testing, and needs to be reflected in the plist as well.
             -->
+            <!-- XCTest -->
             <Directory Name="XCTest-development">
               <Directory Name="usr">
                 <Directory Id="XCTest_usr_bin" Name="$(ArchBinDir)" />
@@ -62,6 +64,20 @@
                 </Directory>
               </Directory>
             </Directory>
+            <!-- Testing -->
+            <Directory Name="Testing-development">
+              <Directory Name="usr">
+                <Directory Id="Testing_usr_bin" Name="$(ArchBinDir)" />
+                <Directory Name="lib">
+                  <Directory Name="swift">
+                    <Directory Name="windows">
+                      <Directory Id="Testing_usr_lib_swift_windows_ARCH" Name="$(ArchArchDir)" />
+                      <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
+                    </Directory>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
           </Directory>
           <Directory Name="SDKs">
             <!-- Windows.sdk -->
@@ -130,6 +146,21 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="Testing">
+      <Component Directory="Testing_usr_bin">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\bin\Testing.dll" />
+      </Component>
+      <Component Directory="Testing_usr_lib_swift_windows_ARCH">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.lib" />
+      </Component>
+      <Component Directory="Testing.swiftmodule">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.swiftmodule\$(ArchTriple).swiftdoc" />
+      </Component>
+      <Component Directory="Testing.swiftmodule">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.swiftmodule\$(ArchTriple).swiftmodule" />
+      </Component>
+    </ComponentGroup>
+
     <ComponentGroup Id="SwiftRemoteMirror" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror">
       <Component>
         <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
@@ -1228,6 +1259,7 @@
     <!-- Features -->
     <Feature Id="SDK" AllowAbsent="no" Title="!(loc.Sdk_ProductName_$(ProductArchitecture))">
       <ComponentGroupRef Id="XCTest" />
+      <ComponentGroupRef Id="Testing" />
       <ComponentGroupRef Id="SwiftRemoteMirror" />
       <ComponentGroupRef Id="BlocksRuntime" />
       <ComponentGroupRef Id="libdispatch" />

From fbc2f1871bc8a1989392139d0109a07e9f10c722 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Mon, 19 Aug 2024 09:19:52 -0700
Subject: [PATCH 2/2] WiX: extract Testing Macros into a component (NFC)

Extract the testing macros into their own component group. Each
repository is currently setup into a single component group that we then
enumerate into the install image. This follows suit for the testing
macros.

(cherry picked from commit 0932d6b3dddce51b893c7741ea896129b98c5812)
---
 platforms/Windows/bld/bld.wxs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
index 7b226577..3f8caaed 100644
--- a/platforms/Windows/bld/bld.wxs
+++ b/platforms/Windows/bld/bld.wxs
@@ -324,9 +324,6 @@
       <Component>
         <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftMacros.dll" />
       </Component>
-      <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
-      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="FoundationMacros" Directory="_usr_bin">
@@ -335,6 +332,12 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="TestingMacros" Directory="_usr_bin">
+      <Component>
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
+      </Component>
+    </ComponentGroup>
+
     <ComponentGroup Id="argument_parser" Directory="_usr_bin">
       <Component>
         <File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
@@ -435,6 +438,7 @@
       <ComponentGroupRef Id="swift_syntax" />
       <ComponentGroupRef Id="SwiftMacros" />
       <ComponentGroupRef Id="FoundationMacros" />
+      <ComponentGroupRef Id="TestingMacros" />
 
       <ComponentGroupRef Id="ClangResources" />