Do not emit 'PASSING, REMOVE FROM FAIL LIST' results when using vcpkg to test prerelease versions of MSVC++ (#19011)

3 files changed, 20 insertions, 4 deletions

diff --git a/scripts/azure-pipelines/analyze-test-results.ps1 b/scripts/azure-pipelines/analyze-test-results.ps1
index d96069abe..29cf01cc3 100755
--- a/scripts/azure-pipelines/analyze-test-results.ps1
+++ b/scripts/azure-pipelines/analyze-test-results.ps1
@@ -23,6 +23,10 @@ The triplet to analyze.
 
 .PARAMETER baselineFile
 The path to the ci.baseline.txt file in the vcpkg repository.
+
+.PARAMETER passingIsPassing
+Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used
+when using vcpkg to test a prerelease MSVC++ compiler)
 #>
 [CmdletBinding()]
 Param(
@@ -32,7 +36,8 @@ Param(
     [Parameter(Mandatory = $true)]
     [string]$triplet,
     [Parameter(Mandatory = $true)]
-    [string]$baselineFile
+    [string]$baselineFile,
+    [switch]$passingIsPassing = $false
 )
 
 $ErrorActionPreference = 'Stop'
@@ -400,6 +405,10 @@ function write_errors_for_summary {
             Write-Verbose "checking $($testName):$triplet $($test.result)"
 
             if ($test.result -eq 'Fail') {
+                if (($test.currentResult) -eq "pass" -and $passingIsPassing) {
+                    continue;
+                }
+
                 $failure_found = $true
                 if ($test.currentResult -eq "pass") {
                     [System.Console]::Error.WriteLine( `
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1
index 11d98e5ce..e089d7a1c 100755
--- a/scripts/azure-pipelines/test-modified-ports.ps1
+++ b/scripts/azure-pipelines/test-modified-ports.ps1
@@ -29,6 +29,10 @@ this parameter is not set, binary caching will not be used. Example: "files,W:\"
 The reason Azure Pipelines is running this script (controls in which mode Binary Caching is used).

 If BinarySourceStub is not set, this parameter has no effect. If BinarySourceStub is set and this is

 not, binary caching will default to read-write mode.

+

+.PARAMETER PassingIsPassing

+Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used

+when using vcpkg to test a prerelease MSVC++ compiler)

 #>

 

 [CmdletBinding(DefaultParameterSetName="ArchivesRoot")]

@@ -47,7 +51,9 @@ Param(
     $UseEnvironmentSasToken = $false,

     [Parameter(ParameterSetName='BinarySourceStub')]

     $BinarySourceStub = $null,

-    $BuildReason = $null

+    $BuildReason = $null,

+    [switch]

+    $PassingIsPassing = $false

 )

 

 if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) {

@@ -148,4 +154,5 @@ else
 }

 & "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults `

     -triplet $Triplet `

-    -baselineFile .\scripts\ci.baseline.txt

+    -baselineFile .\scripts\ci.baseline.txt `

+    -passingIsPassing:$PassingIsPassing

diff --git a/scripts/azure-pipelines/windows-unstable/job.yml b/scripts/azure-pipelines/windows-unstable/job.yml
index 93690e957..346e2bcf3 100644
--- a/scripts/azure-pipelines/windows-unstable/job.yml
+++ b/scripts/azure-pipelines/windows-unstable/job.yml
@@ -72,7 +72,7 @@ jobs:
     inputs:

       failOnStderr: true

       filePath: 'scripts/azure-pipelines/test-modified-ports.ps1'

-      arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)'

+      arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -PassingIsPassing'

       pwsh: true

   - task: PowerShell@2

     displayName: 'Report on Disk Space After Build'