[php-src] master: tests: Allow overriding TEST_PHP_EXECUTABLE for FPM SAPI (#23087)
Lothar Serra Mari via GitHub <[email protected]>
| Newsgroups | gmane.comp.php.cvs.general |
|---|---|
| Message-ID | <[email protected]> |
Author: Lothar Serra Mari (lotharsm)
Committer: GitHub (web-flow)
Pusher: arnaud-lb
Date: 2026-08-07T15:53:03+02:00
Commit: https://github.com/php/php-src/commit/453223babf8339c31add47da77bbc94ef20ce74a
Raw diff: https://github.com/php/php-src/commit/453223babf8339c31add47da77bbc94ef20ce74a.diff
tests: Allow overriding TEST_PHP_EXECUTABLE for FPM SAPI (#23087)
The test suite derives the path to php-fpm from TEST_PHP_EXECUTABLE.
This fails on custom build directory layouts, leading to skipping all
php-fpm related tests.
Users can provide TEST_PHP_FPM_EXECUTABLE for a custom binary path; if
this is unset, we'll fall back to TEST_PHP_EXECUTABLE instead.
Changed paths:
M sapi/fpm/tests/tester.inc
Diff:
diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc
index 907988654337..557f8c25e193 100644
--- a/sapi/fpm/tests/tester.inc
+++ b/sapi/fpm/tests/tester.inc
@@ -225,7 +225,7 @@ class Tester
*/
static public function findExecutable(): bool|string
{
- $phpPath = getenv("TEST_PHP_EXECUTABLE");
+ $phpPath = getenv("TEST_PHP_FPM_EXECUTABLE") ?: getenv("TEST_PHP_EXECUTABLE");
for ($i = 0; $i < 2; $i++) {
$slashPosition = strrpos($phpPath, "/");
if ($slashPosition) {