Skip to content

Commit 5b82364

Browse files
committed
Add extra sdk arguments for code-workspace tests
1 parent ada344f commit 5b82364

File tree

1 file changed

+42
-1
lines changed

1 file changed

+42
-1
lines changed

scripts/test_windows.ps1

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
function Update-SwiftBuildAndPackageArguments {
1616
param (
1717
[string]$jsonFilePath = "./assets/test/.vscode/settings.json",
18+
[string]$codeWorkspaceFilePath = "./assets/test.code-workspace",
1819
[string]$windowsSdkVersion = "10.0.22000.0",
1920
[string]$vcToolsVersion = "14.43.34808"
2021
)
@@ -28,10 +29,22 @@ function Update-SwiftBuildAndPackageArguments {
2829
exit 1
2930
}
3031

32+
try {
33+
$codeWorkspaceContent = Get-Content -Raw -Path $codeWorkspaceFilePath | ConvertFrom-Json
34+
} catch {
35+
Write-Host "Invalid JSON content in $codeWorkspaceFilePath"
36+
exit 1
37+
}
38+
3139
if ($jsonContent.PSObject.Properties['swift.buildArguments']) {
3240
$jsonContent.PSObject.Properties.Remove('swift.buildArguments')
3341
}
3442

43+
if ($codeWorkspaceContent.PSObject.Properties['settings'].PSObject.Properties['swift.buildArguments']) {
44+
$codeWorkspaceContent.PSObject.Properties['settings'].PSObject.Properties.Remove('swift.buildArguments')
45+
}
46+
47+
3548
$jsonContent | Add-Member -MemberType NoteProperty -Name "swift.buildArguments" -Value @(
3649
"-Xbuild-tools-swiftc", "-windows-sdk-root", "-Xbuild-tools-swiftc", $windowsSdkRoot,
3750
"-Xbuild-tools-swiftc", "-windows-sdk-version", "-Xbuild-tools-swiftc", $windowsSdkVersion,
@@ -41,10 +54,23 @@ function Update-SwiftBuildAndPackageArguments {
4154
"-Xswiftc", "-visualc-tools-version", "-Xswiftc", $vcToolsVersion
4255
)
4356

57+
$codeWorkspaceContent.PSObject.Properties['settings'] | Add-Member -MemberType NoteProperty -Name "swift.buildArguments" -Value @(
58+
"-Xbuild-tools-swiftc", "-windows-sdk-root", "-Xbuild-tools-swiftc", $windowsSdkRoot,
59+
"-Xbuild-tools-swiftc", "-windows-sdk-version", "-Xbuild-tools-swiftc", $windowsSdkVersion,
60+
"-Xbuild-tools-swiftc", "-visualc-tools-version", "-Xbuild-tools-swiftc", $vcToolsVersion,
61+
"-Xswiftc", "-windows-sdk-root", "-Xswiftc", $windowsSdkRoot,
62+
"-Xswiftc", "-windows-sdk-version", "-Xswiftc", $windowsSdkVersion,
63+
"-Xswiftc", "-visualc-tools-version", "-Xswiftc", $vcToolsVersion
64+
)
65+
4466
if ($jsonContent.PSObject.Properties['swift.packageArguments']) {
4567
$jsonContent.PSObject.Properties.Remove('swift.packageArguments')
4668
}
4769

70+
if ($codeWorkspaceContent.PSObject.Properties['settings'].PSObject.Properties['swift.packageArguments']) {
71+
$codeWorkspaceContent.PSObject.Properties['settings'].PSObject.Properties.Remove('swift.packageArguments')
72+
}
73+
4874
$jsonContent | Add-Member -MemberType NoteProperty -Name "swift.packageArguments" -Value @(
4975
"-Xbuild-tools-swiftc", "-windows-sdk-root", "-Xbuild-tools-swiftc", $windowsSdkRoot,
5076
"-Xbuild-tools-swiftc", "-windows-sdk-version", "-Xbuild-tools-swiftc", $windowsSdkVersion,
@@ -54,10 +80,25 @@ function Update-SwiftBuildAndPackageArguments {
5480
"-Xswiftc", "-visualc-tools-version", "-Xswiftc", $vcToolsVersion
5581
)
5682

83+
$codeWorkspaceContent.PSObject.Properties['settings'] | Add-Member -MemberType NoteProperty -Name "swift.packageArguments" -Value @(
84+
"-Xbuild-tools-swiftc", "-windows-sdk-root", "-Xbuild-tools-swiftc", $windowsSdkRoot,
85+
"-Xbuild-tools-swiftc", "-windows-sdk-version", "-Xbuild-tools-swiftc", $windowsSdkVersion,
86+
"-Xbuild-tools-swiftc", "-visualc-tools-version", "-Xbuild-tools-swiftc", $vcToolsVersion,
87+
"-Xswiftc", "-windows-sdk-root", "-Xswiftc", $windowsSdkRoot,
88+
"-Xswiftc", "-windows-sdk-version", "-Xswiftc", $windowsSdkVersion,
89+
"-Xswiftc", "-visualc-tools-version", "-Xswiftc", $vcToolsVersion
90+
)
91+
5792
$jsonContent | ConvertTo-Json -Depth 32 | Set-Content -Path $jsonFilePath
5893

94+
95+
$codeWorkspaceContent | ConvertTo-Json -Depth 32 | Set-Content -Path $codeWorkspaceFilePath
96+
5997
Write-Host "Contents of ${jsonFilePath}:"
6098
Get-Content -Path $jsonFilePath
99+
100+
Write-Host "Contents of ${codeWorkspaceFilePath}:"
101+
Get-Content -Path $codeWorkspaceFilePath
61102
}
62103

63104
$swiftVersionOutput = & swift --version
@@ -96,7 +137,7 @@ npm ci -ignore-script node-pty
96137
npm run lint
97138
npm run format
98139
npm run package
99-
npm run test
140+
npm run test -- --label codeWorkspaceTests
100141
if ($LASTEXITCODE -eq 0) {
101142
Write-Host 'SUCCESS'
102143
} else {

0 commit comments

Comments
 (0)