Skip to content

Commit 2e26f11

Browse files
committed
Debug failing windows tests (again)
1 parent 43c2cca commit 2e26f11

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

scripts/test_windows.ps1

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,20 @@ function Update-SwiftBuildAndPackageArguments {
1616
param (
1717
[string]$jsonFilePath = "./assets/test/.vscode/settings.json",
1818
[string]$codeWorkspaceFilePath = "./assets/test.code-workspace",
19-
[string]$windowsSdkVersion = "10.0.22000.0",
20-
[string]$vcToolsVersion = "14.44.35207"
19+
[string]$windowsSdkVersion = "10.0.22000.0"
2120
)
2221

22+
$vcToolsPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
23+
$vcToolsVersions = Get-ChildItem -Directory -Path $vcToolsPath | ForEach-Object { $_.Name }
24+
25+
if ($vcToolsVersions.Count -eq 0) {
26+
Write-Host "No versions found in $vcToolsPath"
27+
exit 1
28+
}
29+
30+
$vcToolsVersion = $vcToolsVersions | Sort-Object -Descending | Select-Object -First 1
31+
Write-Host "Highest Visual C++ Tools version: $vcToolsVersion"
32+
2333
$windowsSdkRoot = "C:\Program Files (x86)\Windows Kits\10\"
2434

2535
try {
@@ -88,6 +98,9 @@ if ($LASTEXITCODE -ne 0) {
8898
Write-Host "Swift version:"
8999
Write-Host "$swiftVersionOutput"
90100

101+
dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
102+
dir "C:\Program Files (x86)\Windows Kits\10\Include\"
103+
91104
$versionLine = $swiftVersionOutput[0]
92105
if ($versionLine -match "Swift version (\d+)\.(\d+)") {
93106
Write-Host "Matched Swift version: $($matches[0]), $($matches[1]), $($matches[2])"

0 commit comments

Comments
 (0)