diff options
Diffstat (limited to 'scripts/azure-pipelines')
| -rwxr-xr-x | scripts/azure-pipelines/analyze-test-results.ps1 | 4 | ||||
| -rwxr-xr-x | scripts/azure-pipelines/test-modified-ports.ps1 | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/scripts/azure-pipelines/analyze-test-results.ps1 b/scripts/azure-pipelines/analyze-test-results.ps1 index 5bebe985c..d96069abe 100755 --- a/scripts/azure-pipelines/analyze-test-results.ps1 +++ b/scripts/azure-pipelines/analyze-test-results.ps1 @@ -100,6 +100,10 @@ function build_test_results { $allTestResults = @{ } foreach ( $test in $xmlCollection.test) { + if (!$test.name.endswith(":$triplet")) + { + continue + } $name = ($test.name -replace ":.*$") # Reconstruct the original BuildResult enumeration (defined in Build.h) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index fa80a1a10..34533aef7 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -142,7 +142,16 @@ if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp', 'x64-windows', 'x64-wi .\vcpkg.exe install yasm-tool:x86-windows @commonArgs
}
-& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs
+if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux'))
+{
+ # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list.
+ # The workaround is to pass the skip list as host-excludes as well.
+ & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs
+}
+else
+{
+ & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs
+}
& "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults `
-triplet $Triplet `
-baselineFile .\scripts\ci.baseline.txt
|