Skip to content

Commit 93e7a4b

Browse files
rintarorintaro
committed
[Windows/Android] Add swift-testing
1 parent 80608af commit 93e7a4b

File tree

3 files changed

+69
-6
lines changed

3 files changed

+69
-6
lines changed

‎platforms/Windows/android_sdk/android_sdk.wxs

+31-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
└─ Android.platform
3838
└─ Developer
3939
├─ Library
40-
│ └─ XCTest-development
40+
│ ├─ XCTest-development
41+
│ │ └─ ...
42+
│ └─ Testing-development
4143
│ └─ ...
4244
└─ SDKs
4345
└─ Android.sdk
@@ -47,11 +49,11 @@
4749
<Directory Id="AndroidPlatform" Name="Android.platform">
4850
<Directory Name="Developer">
4951
<Directory Name="Library">
50-
<!-- XCTest -->
5152
<!--
5253
FIXME(compnerd) this should actually be the proper version
53-
of XCTest, and needs to be reflected in the plist as well.
54+
of XCTest and Tesing, and needs to be reflected in the plist as well.
5455
-->
56+
<!-- XCTest -->
5557
<Directory Name="XCTest-development">
5658
<Directory Name="usr">
5759
<Directory Name="lib">
@@ -64,6 +66,19 @@
6466
</Directory>
6567
</Directory>
6668
</Directory>
69+
<!-- Testing -->
70+
<Directory Name="Testing-development">
71+
<Directory Name="usr">
72+
<Directory Name="lib">
73+
<Directory Name="swift">
74+
<Directory Name="android">
75+
<Directory Id="Testing_usr_lib_swift_android_ARCH" Name="$(ArchArchDir)" />
76+
<Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
77+
</Directory>
78+
</Directory>
79+
</Directory>
80+
</Directory>
81+
</Directory>
6782
</Directory>
6883
<Directory Name="SDKs">
6984
<!-- Android.sdk -->
@@ -129,6 +144,18 @@
129144
</Component>
130145
</ComponentGroup>
131146

147+
<ComponentGroup Id="Testing">
148+
<Component Directory="Testing_usr_lib_swift_android_ARCH">
149+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\libTesting.so" />
150+
</Component>
151+
<Component Directory="Testing.swiftmodule">
152+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\Testing.swiftmodule\$(ArchTriple).swiftdoc" />
153+
</Component>
154+
<Component Directory="Testing.swiftmodule">
155+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\Testing.swiftmodule\$(ArchTriple).swiftmodule" />
156+
</Component>
157+
</ComponentGroup>
158+
132159
<ComponentGroup Id="SwiftRemoteMirror" Directory="AndroidSDK_usr_include_swift_SwiftRemoteMirror">
133160
<Component>
134161
<File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
@@ -1203,6 +1230,7 @@
12031230
<!-- Features -->
12041231
<Feature Id="AndroidSDK" AllowAbsent="no" Title="!(loc.Android_Sdk_$(ArchName))">
12051232
<ComponentGroupRef Id="XCTest" />
1233+
<ComponentGroupRef Id="Testing" />
12061234
<ComponentGroupRef Id="SwiftRemoteMirror" />
12071235
<ComponentGroupRef Id="BlocksRuntime" />
12081236
<ComponentGroupRef Id="libdispatch" />

‎platforms/Windows/bld/bld.wxs

+3
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,9 @@
333333
<Component>
334334
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftMacros.dll" />
335335
</Component>
336+
<Component>
337+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
338+
</Component>
336339
</ComponentGroup>
337340

338341
<ComponentGroup Id="argument_parser" Directory="_usr_bin">

‎platforms/Windows/sdk/sdk.wxs

+35-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
└─ Windows.platform
3535
└─ Developer
3636
├─ Library
37-
│ └─ XCTest-development
37+
│ ├─ XCTest-development
38+
│ │ └─ ...
39+
│ └─ Testing-development
3840
│ └─ ...
3941
└─ SDKs
4042
└─ Windows.sdk
@@ -44,11 +46,11 @@
4446
<Directory Id="WindowsPlatform" Name="Windows.platform">
4547
<Directory Name="Developer">
4648
<Directory Name="Library">
47-
<!-- XCTest -->
4849
<!--
4950
FIXME(compnerd) this should actually be the proper version
50-
of XCTest, and needs to be reflected in the plist as well.
51+
of XCTest and Testing, and needs to be reflected in the plist as well.
5152
-->
53+
<!-- XCTest -->
5254
<Directory Name="XCTest-development">
5355
<Directory Name="usr">
5456
<Directory Id="XCTest_usr_bin" Name="$(ArchBinDir)" />
@@ -62,6 +64,20 @@
6264
</Directory>
6365
</Directory>
6466
</Directory>
67+
<!-- Testing -->
68+
<Directory Name="Testing-development">
69+
<Directory Name="usr">
70+
<Directory Id="Testing_usr_bin" Name="$(ArchBinDir)" />
71+
<Directory Name="lib">
72+
<Directory Name="swift">
73+
<Directory Name="windows">
74+
<Directory Id="Testing_usr_lib_swift_windows_ARCH" Name="$(ArchArchDir)" />
75+
<Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
76+
</Directory>
77+
</Directory>
78+
</Directory>
79+
</Directory>
80+
</Directory>
6581
</Directory>
6682
<Directory Name="SDKs">
6783
<!-- Windows.sdk -->
@@ -130,6 +146,21 @@
130146
</Component>
131147
</ComponentGroup>
132148

149+
<ComponentGroup Id="Testing">
150+
<Component Directory="Testing_usr_bin">
151+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\bin\Testing.dll" />
152+
</Component>
153+
<Component Directory="Testing_usr_lib_swift_windows_ARCH">
154+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.lib" />
155+
</Component>
156+
<Component Directory="Testing.swiftmodule">
157+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.swiftmodule\$(ArchTriple).swiftdoc" />
158+
</Component>
159+
<Component Directory="Testing.swiftmodule">
160+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.swiftmodule\$(ArchTriple).swiftmodule" />
161+
</Component>
162+
</ComponentGroup>
163+
133164
<ComponentGroup Id="SwiftRemoteMirror" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror">
134165
<Component>
135166
<File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
@@ -1207,6 +1238,7 @@
12071238
<!-- Features -->
12081239
<Feature Id="SDK" AllowAbsent="no" Title="!(loc.Sdk_ProductName_$(ProductArchitecture))">
12091240
<ComponentGroupRef Id="XCTest" />
1241+
<ComponentGroupRef Id="Testing" />
12101242
<ComponentGroupRef Id="SwiftRemoteMirror" />
12111243
<ComponentGroupRef Id="BlocksRuntime" />
12121244
<ComponentGroupRef Id="libdispatch" />

0 commit comments

Comments
 (0)