Fix CompatPatchApplied handling in PHP tests

Author: shivammathur

php/BuildPhp/private/Add-TestRequirements.ps1

@@ -67,7 +67,7 @@ function Add-TestRequirements {
 
         if(-not(Test-Path $binZipFilePath)) {
             Write-Host "Downloading PHP build $binZipFile..."
-            Get-PhpBuild -PhpVersion $PhpVersion -Arch $Arch -Ts $Ts -VsVersion $VsVersion
+            $null = Get-PhpBuild -PhpVersion $PhpVersion -Arch $Arch -Ts $Ts -VsVersion $VsVersion
         } else {
             try {
                 [System.IO.Compression.ZipFile]::ExtractToDirectory($binZipFilePath, $binDirectoryPath)
@@ -82,10 +82,10 @@ function Add-TestRequirements {
             } else {
                 Write-Host "Downloading PHP test pack $testZipFile..."
             }
-            Get-PhpTestPack -PhpVersion $PhpVersion `
-                            -TestsDirectory $TestsDirectory `
-                            -SourceRepository $SourceRepository `
-                            -SourceRef $SourceRef
+            $null = Get-PhpTestPack -PhpVersion $PhpVersion `
+                                    -TestsDirectory $TestsDirectory `
+                                    -SourceRepository $SourceRepository `
+                                    -SourceRef $SourceRef
         } else {
             try {
                 [System.IO.Compression.ZipFile]::ExtractToDirectory($testZipFilePath, $testsDirectoryPath)
@@ -134,11 +134,11 @@ function Add-TestRequirements {
             $FetchDeps = $True
         }
         if($FetchDeps -eq $True -or $null -eq $Env:DEPS_CACHE_HIT -or $Env:DEPS_CACHE_HIT -ne 'true') {
-            Add-PhpDeps -PhpVersion $PhpVersion -VsVersion $VsVersion -Arch $Arch -Destination $env:DEPS_DIR
+            $null = Add-PhpDeps -PhpVersion $PhpVersion -VsVersion $VsVersion -Arch $Arch -Destination $env:DEPS_DIR
         }
-        Invoke-EditBin -Exe "$binDirectoryPath\php.exe" -StackSize 8388608 -Arch $Arch
-        Invoke-EditBin -Exe "$binDirectoryPath\php-cgi.exe" -StackSize 8388608 -Arch $Arch
-        Add-Path "$env:DEPS_DIR\bin"
+        $null = Invoke-EditBin -Exe "$binDirectoryPath\php.exe" -StackSize 8388608 -Arch $Arch
+        $null = Invoke-EditBin -Exe "$binDirectoryPath\php-cgi.exe" -StackSize 8388608 -Arch $Arch
+        $null = Add-Path "$env:DEPS_DIR\bin"
         return [PSCustomObject]@{
             CompatPatchApplied = $compatPatchApplied
         }

php/BuildPhp/public/Invoke-PhpTests.ps1

@@ -127,8 +127,17 @@ function Invoke-PhpTests {
             "-r", "$TestType-tests-to-run.txt"
         )
 
+        $compatPatchApplied = $true
+        if ($null -ne $testSetup) {
+            foreach ($setupOutput in @($testSetup)) {
+                if ($setupOutput -and $setupOutput.PSObject.Properties.Name -contains 'CompatPatchApplied') {
+                    $compatPatchApplied = [bool]$setupOutput.CompatPatchApplied
+                }
+            }
+        }
+
         $workers = $settings.workers
-        if($workers -ne "" -and $testSetup -and -not $testSetup.CompatPatchApplied) {
+        if($workers -ne "" -and -not $compatPatchApplied) {
             $workers = "-j2"
         }