github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Sync eng/common directory with azure-sdk-tools for PR 1498 (#1924)

Browse Source 
* Fix null check against matrix parameter array

* add negative test cases

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
Co-authored-by: Chidozie Ononiwu <31145988+chidozieononiwu@users.noreply.github.com>
This commit is contained in:
Azure SDK Bot 2021-03-18 10:34:30 -07:00 committed by GitHub
parent e360553546
commit e464f8b01e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eng/common/scripts/job-matrix/job-matrix-functions.ps1
View File

@ -474,7 +474,7 @@ function GenerateFullMatrix(
[Hashtable]$displayNamesLookup = @{}
) {
# Handle when the config does not have a matrix specified (e.g. only the include field is specified)
if ($parameters.Count -eq 0) {
if (!$parameters) {
return @()
}

22
eng/common/scripts/job-matrix/tests/job-matrix-functions.modification.tests.ps1
View File

@ -404,4 +404,26 @@ Describe "Platform Matrix Replace" -Tag "replace" {
$matrix[1].name | Should -Be "foo2_barReplacedBar2"
$matrix[1].parameters.Bar | Should -Be "barReplacedBar2"
}
It "Should only fully match a string for replace" {
$matrixJson = @'
{
"matrix": {
"Foo": [ "foo1", "foo2" ],
"Bar": "bar1"
}
}
'@
$importConfig = GetMatrixConfigFromJson $matrixJson
$replace = @("Foo=foo/shouldNotReplaceFoo", "B=bar1/shouldNotReplaceBar")
$matrix = GenerateMatrix -config $importConfig -selectFromMatrixType "sparse" -replace $replace
$matrix.Length | Should -Be 2
$matrix[0].parameters.Foo | Should -Be "foo1"
$matrix[0].parameters.Bar | Should -Be "bar1"
$matrix[1].parameters.Foo | Should -Be "foo2"
$matrix[1].parameters.Bar | Should -Be "bar1"
}
}

34
eng/common/scripts/job-matrix/tests/job-matrix-functions.tests.ps1
View File

@ -466,6 +466,40 @@ Describe "Platform Matrix Post Transformation" -Tag "transform" {
$matrix[7].parameters.operatingSystem | Should -Be "windows-2019"
$matrix[7].parameters.additionalArguments | Should -Be "--enableWindowsFoo"
}
It "Should parse a config with an empty base matrix" {
$matrixConfigForIncludeOnly = @"
{
"include": [
{
"operatingSystem": "windows-2019",
"framework": "net461"
}
]
}
"@
$config = GetMatrixConfigFromJson $matrixConfigForIncludeOnly
[Array]$matrix = GenerateMatrix $config "all"
$matrix.Length | Should -Be 1
$matrix[0].name | Should -Be "windows2019_net461"
}
It "Should parse a config with an empty include" {
$matrixConfigForIncludeOnly = @"
{
"matrix": {
"operatingSystem": "windows-2019",
"framework": "net461"
}
}
"@
$config = GetMatrixConfigFromJson $matrixConfigForIncludeOnly
[Array]$matrix = GenerateMatrix $config "all"
$matrix.Length | Should -Be 1
$matrix[0].name | Should -Be "windows2019_net461"
}
}
Describe "Platform Matrix Generation With Object Fields" -Tag "objectfields" {