Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 1 commit into from
Jul 20, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion scripts/azure-pipelines/analyze-test-results.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -32,7 +36,8 @@ Param(
[Parameter(Mandatory = $true)]
[string]$triplet,
[Parameter(Mandatory = $true)]
[string]$baselineFile
[string]$baselineFile,
[switch]$passingIsPassing = $false
)

$ErrorActionPreference = 'Stop'
Expand Down Expand Up @@ -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( `
Expand Down
11 changes: 9 additions & 2 deletions scripts/azure-pipelines/test-modified-ports.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand All @@ -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"))) {
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/windows-unstable/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down