Merge pull request swiftlang#334 from rintaro/6.0.0-add-swift-testing

[6.0.0][Windows/Android] Add swift-testing
compnerd · Aug 24, 2024 · 8cdefcb · 8cdefcb
2 parents 7c1aeb6 + 6004402
commit 8cdefcb
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
@@ -332,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" />
@@ -432,6 +438,7 @@
       <ComponentGroupRef Id="swift_syntax" />
       <ComponentGroupRef Id="SwiftMacros" />
       <ComponentGroupRef Id="FoundationMacros" />
+      <ComponentGroupRef Id="TestingMacros" />
 
       <ComponentGroupRef Id="ClangResources" />
 

diff --git 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" />