Skip to content

Commit 616b45f

Browse files
committed
Debug failing windows tests
1 parent a671524 commit 616b45f

File tree

1 file changed

+36
-17
lines changed

1 file changed

+36
-17
lines changed

scripts/test_windows.ps1

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function Update-SwiftBuildAndPackageArguments {
1717
[string]$jsonFilePath = "./assets/test/.vscode/settings.json",
1818
[string]$codeWorkspaceFilePath = "./assets/test.code-workspace",
1919
[string]$windowsSdkVersion = "10.0.22000.0",
20-
[string]$vcToolsVersion = "14.43.34808"
20+
[string]$vcToolsVersion = "14.44.35207"
2121
)
2222

2323
$windowsSdkRoot = "C:\Program Files (x86)\Windows Kits\10\"
@@ -86,7 +86,7 @@ if ($LASTEXITCODE -ne 0) {
8686
}
8787

8888
Write-Host "Swift version:"
89-
Write-Host "$swiftVersionOutput"
89+
Write-Host "$swiftVersionOutput "
9090

9191
$versionLine = $swiftVersionOutput[0]
9292
if ($versionLine -match "Swift version (\d+)\.(\d+)") {
@@ -101,24 +101,43 @@ if ($versionLine -match "Swift version (\d+)\.(\d+)") {
101101
# Newer versions of swift (>=6.1) have a fixed modulemap that resolves the issue: https://github.com/swiftlang/swift/pull/79751
102102
# As a workaround we can pin the tools/SDK versions to older versions that are present in the GH Actions Windows image.
103103
# In the future we may only want to apply this workaround to older versions of Swift that don't have the fixed module map.
104-
if ($majorVersion -lt 6 -or ($majorVersion -eq 6 -and $minorVersion -lt 1)) {
105-
Write-Host "Swift version is < 6.1, injecting windows SDK build arguments"
106-
Update-SwiftBuildAndPackageArguments
107-
}
104+
# if ($majorVersion -lt 6 -or ($majorVersion -eq 6 -and $minorVersion -lt 1)) {
105+
# Write-Host "Swift version is < 6.1, injecting windows SDK build arguments"
106+
# Update-SwiftBuildAndPackageArguments
107+
# }
108108
} else {
109109
Write-Host "Match failed for output: `"$versionLine`""
110110
Write-Host "Unable to determine Swift version"
111111
exit 1
112112
}
113113

114-
npm ci -ignore-script node-pty
115-
npm run lint
116-
npm run format
117-
npm run package
118-
npm run test
119-
if ($LASTEXITCODE -eq 0) {
120-
Write-Host 'SUCCESS'
121-
} else {
122-
Write-Host ('FAILED ({0})' -f $LASTEXITCODE)
123-
exit 1
124-
}
114+
115+
# Prepare test application
116+
mkdir ./testapp
117+
cd testapp
118+
swift package init --type executable
119+
120+
dir "C:\Program Files\Microsoft Visual Studio\"
121+
dir "C:\Program Files\Microsoft Visual Studio\2022"
122+
dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
123+
dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC"
124+
dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools"
125+
dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
126+
127+
dir "C:\Program Files (x86)\Windows Kits\10\Include\"
128+
129+
# Swift Build and Run Command with Explicit Include Path
130+
swift build -Xbuild-tools-swiftc "-windows-sdk-root" -Xbuild-tools-swiftc "C:\Program Files (x86)\Windows Kits\10" -Xbuild-tools-swiftc "-windows-sdk-version" -Xbuild-tools-swiftc "10.0.22000.0" -Xbuild-tools-swiftc "-visualc-tools-version" -Xbuild-tools-swiftc "14.44.35207" -Xswiftc "-windows-sdk-root" -Xswiftc "C:\Program Files (x86)\Windows Kits\10" -Xswiftc "-windows-sdk-version" -Xswiftc "10.0.22000.0" -Xswiftc "-visualc-tools-version" -Xswiftc "14.44.35207"
131+
# swift run -Xbuild-tools-swiftc "-windows-sdk-root" -Xbuild-tools-swiftc "C:\Program Files (x86)\Windows Kits\10" -Xbuild-tools-swiftc "-windows-sdk-version" -Xbuild-tools-swiftc "10.0.22000.0" -Xbuild-tools-swiftc "-visualc-tools-version" -Xbuild-tools-swiftc "14.44.35207" -Xswiftc "-windows-sdk-root" -Xswiftc "C:\Program Files (x86)\Windows Kits\10" -Xswiftc "-windows-sdk-version" -Xswiftc "10.0.22000.0" -Xswiftc "-visualc-tools-version" -Xswiftc "14.44.35207"
132+
133+
# npm ci -ignore-script node-pty
134+
# npm run lint
135+
# npm run format
136+
# npm run package
137+
# npm run test
138+
# if ($LASTEXITCODE -eq 0) {
139+
# Write-Host 'SUCCESS'
140+
# } else {
141+
# Write-Host ('FAILED ({0})' -f $LASTEXITCODE)
142+
# exit 1
143+
# }

0 commit comments

Comments
 (0)