Fix PHP test harness environments

shivammathur · shivammathur · commit ee81f5fdfc58 · 2026-04-26T10:58:37.000+05:30
diff --git a/php/BuildPhp/config/ext_test_directories b/php/BuildPhp/config/ext_test_directories
@@ -44,7 +44,6 @@ ext\reflection\tests
 ext\session\tests
 ext\shmop\tests
 ext\simplexml\tests
-ext\snmp\tests
 ext\soap\tests
 ext\sockets\tests
 ext\sodium\tests
diff --git a/php/BuildPhp/config/run-tests/run-tests-7.4.patch b/php/BuildPhp/config/run-tests/run-tests-7.4.patch
@@ -476,6 +476,17 @@
                  break;
              default:
                  send_message($workerSock, [
+@@ -3384,7 +3691,9 @@
+
+         if (!empty($suite_name)) {
+             foreach ($suite['files'] as $file) {
+-                $result .= $JUNIT['files'][$file]['xml'];
++                if (isset($JUNIT['files'][$file]['xml'])) {
++                    $result .= $JUNIT['files'][$file]['xml'];
++                }
+             }
+         }
+
 @@ -3414,6 +3721,8 @@
      if (!junit_enabled()) return;
 
@@ -493,3 +504,21 @@
      $JUNIT['suites'][$suite][$param] += $value;
  }
 
+@@ -3586,7 +3895,7 @@
+     $JUNIT['test_skip']  += $junit['test_skip'];
+     $JUNIT['test_warn']  += $junit['test_warn'];
+     $JUNIT['execution_time'] += $junit['execution_time'];
+-    $JUNIT['files'] += $junit['files'];
++    $JUNIT['files'] = array_replace($JUNIT['files'], $junit['files']);
+     foreach ($junit['suites'] as $name => $suite) {
+         if (!isset($JUNIT['suites'][$name])) {
+             $JUNIT['suites'][$name] = $suite;
+@@ -3601,7 +3910,7 @@
+         $SUITE['test_skip']  += $suite['test_skip'];
+         $SUITE['test_warn']  += $suite['test_warn'];
+         $SUITE['execution_time'] += $suite['execution_time'];
+-        $SUITE['files'] += $suite['files'];
++        $SUITE['files'] = array_replace($SUITE['files'], $suite['files']);
+     }
+ }
+
diff --git a/php/BuildPhp/config/run-tests/run-tests-8.0.patch b/php/BuildPhp/config/run-tests/run-tests-8.0.patch
@@ -469,6 +469,17 @@
                  break;
              default:
                  send_message($workerSock, [
+@@ -3464,7 +3770,9 @@
+
+         if (!empty($suite_name)) {
+             foreach ($suite['files'] as $file) {
+-                $result .= $JUNIT['files'][$file]['xml'];
++                if (isset($JUNIT['files'][$file]['xml'])) {
++                    $result .= $JUNIT['files'][$file]['xml'];
++                }
+             }
+         }
+
 @@ -3496,6 +3802,8 @@
      }
 
@@ -486,3 +497,21 @@
      $JUNIT['suites'][$suite][$param] += $value;
  }
 
+@@ -3677,7 +3985,7 @@
+     $JUNIT['test_skip']  += $junit['test_skip'];
+     $JUNIT['test_warn']  += $junit['test_warn'];
+     $JUNIT['execution_time'] += $junit['execution_time'];
+-    $JUNIT['files'] += $junit['files'];
++    $JUNIT['files'] = array_replace($JUNIT['files'], $junit['files']);
+     foreach ($junit['suites'] as $name => $suite) {
+         if (!isset($JUNIT['suites'][$name])) {
+             $JUNIT['suites'][$name] = $suite;
+@@ -3692,7 +4000,7 @@
+         $SUITE['test_skip']  += $suite['test_skip'];
+         $SUITE['test_warn']  += $suite['test_warn'];
+         $SUITE['execution_time'] += $suite['execution_time'];
+-        $SUITE['files'] += $suite['files'];
++        $SUITE['files'] = array_replace($SUITE['files'], $suite['files']);
+     }
+ }
+
diff --git a/php/BuildPhp/config/run-tests/run-tests-8.1.patch b/php/BuildPhp/config/run-tests/run-tests-8.1.patch
@@ -472,6 +472,17 @@
                  break;
              default:
                  send_message($workerSock, [
+@@ -3549,7 +3858,9 @@
+
+             if (!empty($suite_name)) {
+                 foreach ($suite['files'] as $file) {
+-                    $result .= $this->rootSuite['files'][$file]['xml'];
++                    if (isset($this->rootSuite['files'][$file]['xml'])) {
++                        $result .= $this->rootSuite['files'][$file]['xml'];
++                    }
+                 }
+             }
+
 @@ -3571,6 +3880,8 @@
          }
 
@@ -489,3 +500,12 @@
          $this->suites[$suite][$param] += $value;
      }
 
+@@ -3753,7 +4064,7 @@
+         $dest['test_skip']  += $source['test_skip'];
+         $dest['test_warn']  += $source['test_warn'];
+         $dest['execution_time'] += $source['execution_time'];
+-        $dest['files'] += $source['files'];
++        $dest['files'] = array_replace($dest['files'], $source['files']);
+     }
+ }
+
diff --git a/php/BuildPhp/config/run-tests/run-tests-8.2-plus.patch b/php/BuildPhp/config/run-tests/run-tests-8.2-plus.patch
@@ -1,6 +1,6 @@
 --- run-tests.php
 +++ run-tests.php
-@@ -140,6 +140,275 @@
+@@ -140,6 +140,288 @@
   * code that was previously found at the top level. It could and should be
   * refactored to be smaller and more manageable.
   */
@@ -108,6 +108,19 @@
 +        }
 +    }
 +
++    function buildphp_worker_recovery_save_junit_on_error($message)
++    {
++        if (($GLOBALS['workerID'] ?? 0) !== 0 || !buildphp_worker_recovery_has_object_junit()) {
++            return;
++        }
++
++        $junit = $GLOBALS['junit'];
++        if ($junit->isEnabled()) {
++            $junit->markTestAs('BORK', 'run-tests.php', 'Infrastructure error', null, $message);
++            $junit->saveXML();
++        }
++    }
++
 +    function buildphp_worker_recovery_track_started(&$workerBatches, $workerID, $assignedName, $name, $index)
 +    {
 +        if (!isset($workerBatches[$workerID])) {
@@ -278,7 +291,7 @@
      /* This list was derived in a naïve mechanical fashion. If a member
 @@ -1285,22 +1553,20 @@
      }
-
+ 
      foreach ($test_files as $name) {
 -        if (is_array($name)) {
 -            $index = "# $name[1]: $name[0]";
@@ -295,7 +308,7 @@
 +        $index = buildphp_worker_recovery_format_test_index($name, $redir_tested);
 +        $name = buildphp_worker_recovery_get_result_test_name($name, $redir_tested);
          $test_idx++;
-
+ 
          if ($workerID) {
              $PHP_FAILED_TESTS = ['BORKED' => [], 'FAILED' => [], 'WARNED' => [], 'LEAKED' => [], 'XFAILED' => [], 'XLEAKED' => [], 'SLOW' => []];
              ob_start();
@@ -306,7 +319,7 @@
 +                "index" => $index,
 +            ]);
          }
-
+ 
          $result = run_test($php, $name, $env);
 @@ -1312,12 +1578,15 @@
              if ($workerID) {
@@ -324,18 +337,18 @@
 +                buildphp_worker_recovery_reset_junit();
                  continue;
              }
-
+ 
 @@ -1345,6 +1614,8 @@
-
+ 
      $workerProcs = [];
      $workerSocks = [];
 +    $workerBatches = [];
 +    $workerCrashRetryTests = [];
-
+ 
      // Each test may specify a list of conflict keys. While a test that conflicts with
      // key K is running, no other test that conflicts with K may run. Conflict keys are
 @@ -1486,6 +1756,15 @@
-
+ 
  escape:
      while ($test_files || $sequentialTests || $testsInProgress > 0) {
 +        if (!$workerSocks) {
@@ -378,7 +391,7 @@
                      error("Worker $i died unexpectedly");
                  }
 @@ -1520,19 +1829,12 @@
-
+ 
                      switch ($message["type"]) {
                          case "tests_finished":
 -                            $testsInProgress--;
@@ -434,9 +447,9 @@
                                  $PHP_FAILED_TESTS[$category] = array_merge($PHP_FAILED_TESTS[$category], $tests);
                              }
 @@ -1630,4 +1940,12 @@
-
+ 
      kill_children($workerProcs);
-
+ 
 +    if ($workerCrashRetryTests) {
 +        echo "Retrying " . count($workerCrashRetryTests) . " tests interrupted by worker crashes serially...\n";
 +        $savedWorkers = $workers;
@@ -458,20 +471,45 @@
                  break;
              default:
                  send_message($workerSock, [
-@@ -3380,6 +3694,8 @@
+@@ -2942,6 +3269,7 @@
+ function error(string $message): void
+ {
+     echo "ERROR: {$message}\n";
++    buildphp_worker_recovery_save_junit_on_error($message);
+     exit(1);
+ }
+ 
+@@ -3353,5 +3681,7 @@
+             if (!empty($suite_name)) {
+                 foreach ($suite['files'] as $file) {
+-                    $result .= $this->rootSuite['files'][$file]['xml'];
++                    if (isset($this->rootSuite['files'][$file]['xml'])) {
++                        $result .= $this->rootSuite['files'][$file]['xml'];
++                    }
+                 }
+             }
+@@ -3380,6 +3708,8 @@
          }
-
+ 
          $suite = $this->getSuiteName($file_name);
 +        $this->initSuite($suite);
 +        $this->suites[$suite]['files'][$file_name] = $file_name;
-
+ 
          $this->record($suite, 'test_total');
-
+ 
 @@ -3428,6 +3744,7 @@
      private function record(string $suite, string $param, $value = 1): void
      {
          $this->rootSuite[$param] += $value;
 +        $this->initSuite($suite);
          $this->suites[$suite][$param] += $value;
      }
-
+ 
+@@ -3473,6 +3791,6 @@
+         $dest['test_skip']  += $source['test_skip'];
+         $dest['test_warn']  += $source['test_warn'];
+         $dest['execution_time'] += $source['execution_time'];
+-        $dest['files'] += $source['files'];
++        $dest['files'] = array_replace($dest['files'], $source['files']);
+     }
+ }
diff --git a/php/BuildPhp/private/Set-FirebirdTestEnvironment.ps1 b/php/BuildPhp/private/Set-FirebirdTestEnvironment.ps1
@@ -2,17 +2,22 @@ function Set-FirebirdTestEnvironment {
     <#
     .SYNOPSIS
         Configure Firebird for PDO_Firebird tests on Windows.
+    .PARAMETER Arch
+        PHP architecture.
     #>
     [CmdletBinding()]
-    param ()
+    param (
+        [Parameter(Mandatory = $false, Position=0, HelpMessage='PHP architecture')]
+        [ValidateSet('x86', 'x64')]
+        [string] $Arch = 'x64'
+    )
     process {
-        $destDir = 'C:\Firebird'
+        $destDir = "C:\Firebird-$Arch"
         $firebirdVersion = 'v4.0.4'
         $firebirdRelease = "https://github.com/FirebirdSQL/firebird/releases/download/$firebirdVersion"
         New-Item -ItemType Directory -Force -Path $destDir | Out-Null
 
-        $is64 = [Environment]::Is64BitOperatingSystem
-        $url = if ($is64) {
+        $url = if ($Arch -eq 'x64') {
             "$firebirdRelease/Firebird-4.0.4.3010-0-x64.zip"
         } else {
             "$firebirdRelease/Firebird-4.0.4.3010-0-Win32.zip"
@@ -28,10 +33,11 @@ function Set-FirebirdTestEnvironment {
             [System.IO.Compression.ZipFile]::ExtractToDirectory($zipPath, $destDir)
         }
 
-        $env:PDO_FIREBIRD_TEST_DATABASE = 'C:\test.fdb'
+        $env:PDO_FIREBIRD_TEST_DATABASE = "C:\test-$Arch.fdb"
         $env:PDO_FIREBIRD_TEST_DSN      = "firebird:dbname=127.0.0.1:$($env:PDO_FIREBIRD_TEST_DATABASE)"
         $env:PDO_FIREBIRD_TEST_USER     = 'SYSDBA'
         $env:PDO_FIREBIRD_TEST_PASS     = 'phpfi'
+        $serviceName = "PHPTestFirebird$Arch"
 
         $createUserSql = Join-Path $destDir 'create_user.sql'
         Set-Content -Path $createUserSql -Value "create user $($env:PDO_FIREBIRD_TEST_USER) password '$($env:PDO_FIREBIRD_TEST_PASS)';" -Encoding ASCII
@@ -40,10 +46,13 @@ function Set-FirebirdTestEnvironment {
         $setupSql = Join-Path $destDir 'setup.sql'
         Set-Content -Path $setupSql -Value "create database '$($env:PDO_FIREBIRD_TEST_DATABASE)' user '$($env:PDO_FIREBIRD_TEST_USER)' password '$($env:PDO_FIREBIRD_TEST_PASS)';" -Encoding ASCII
         if(-not(Test-Path pdo_firebird_db_created)) {
-            & (Join-Path $destDir 'instsvc.exe') install -n TestInstance | Out-Null
+            if (Test-Path -LiteralPath $env:PDO_FIREBIRD_TEST_DATABASE) {
+                Remove-Item -LiteralPath $env:PDO_FIREBIRD_TEST_DATABASE -Force
+            }
+            & (Join-Path $destDir 'instsvc.exe') install -n $serviceName | Out-Null
             & (Join-Path $destDir 'isql') -q -i $setupSql | Out-Null
             & (Join-Path $destDir 'isql') -q -i $createUserSql -user sysdba $env:PDO_FIREBIRD_TEST_DATABASE | Out-Null
-            & (Join-Path $destDir 'instsvc.exe') start -n TestInstance | Out-Null
+            & (Join-Path $destDir 'instsvc.exe') start -n $serviceName | Out-Null
             Set-Content -Path pdo_firebird_db_created -Value "db_created" -Encoding ASCII
         }
 
diff --git a/php/BuildPhp/private/Set-MsSqlTestEnvironment.ps1 b/php/BuildPhp/private/Set-MsSqlTestEnvironment.ps1
@@ -11,9 +11,26 @@ function Set-MsSqlTestEnvironment {
         }
 
         $serviceName = 'MSSQL$SQLEXPRESS'
-        & choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
-        if (@(0, 3010) -notcontains $LASTEXITCODE) {
-            throw "Failed to install SQL Server Express. choco exited with $LASTEXITCODE."
+        $installExitCode = $null
+        for($attempt = 1; $attempt -le 3; $attempt++) {
+            Write-Host "Installing SQL Server Express (attempt $attempt of 3)..."
+            & choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
+            $installExitCode = $LASTEXITCODE
+            if (@(0, 3010) -contains $installExitCode) {
+                break
+            }
+
+            $service = Get-Service -Name $serviceName -ErrorAction SilentlyContinue
+            if ($service) {
+                break
+            }
+
+            if ($attempt -lt 3) {
+                Start-Sleep -Seconds (15 * $attempt)
+            }
+        }
+        if (@(0, 3010) -notcontains $installExitCode -and -not (Get-Service -Name $serviceName -ErrorAction SilentlyContinue)) {
+            throw "Failed to install SQL Server Express. choco exited with $installExitCode."
         }
 
         $service = Get-Service -Name $serviceName -ErrorAction SilentlyContinue
diff --git a/php/BuildPhp/private/Set-PhpExtTestEnvironment.ps1 b/php/BuildPhp/private/Set-PhpExtTestEnvironment.ps1
diff --git a/php/BuildPhp/private/Set-PhpIniForTests.ps1 b/php/BuildPhp/private/Set-PhpIniForTests.ps1
diff --git a/php/BuildPhp/public/Invoke-PhpTests.ps1 b/php/BuildPhp/public/Invoke-PhpTests.ps1
