Skip to content

[6.0][Windows/Android] Add swift-testing #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2024
Merged

[6.0][Windows/Android] Add swift-testing #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48bd486
[Windows/Android] Add swift-testing
rintaro Jul 30, 2024
fbc2f18
WiX: extract Testing Macros into a component (NFC)
compnerd Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions platforms/Windows/bld/bld.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -432,6 +438,7 @@
<ComponentGroupRef Id="swift_syntax" />
<ComponentGroupRef Id="SwiftMacros" />
<ComponentGroupRef Id="FoundationMacros" />
<ComponentGroupRef Id="TestingMacros" />

<ComponentGroupRef Id="ClangResources" />

Expand Down
38 changes: 35 additions & 3 deletions platforms/Windows/sdk/sdk.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
└─ Windows.platform
└─ Developer
├─ Library
│ └─ XCTest-development
│ ├─ XCTest-development
│ │ └─ ...
│ └─ Testing-development
│ └─ ...
└─ SDKs
└─ Windows.sdk
Expand All @@ -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)" />
Expand All @@ -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 -->
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down