archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

When running FPM tests, pass -n option to php-fpm

Browse source 
"make test" was failing for me, because I was running it prior to
install, and there was an old installed version which was incompatible.
The FPM tests were using the installed php.ini which referenced
installed dynamically linked extensions.

So, pass -n to php-fpm.

FPM\Tester::start() has $extensions, $iniEntries and
TEST_FPM_EXTENSION_DIR but they are not actually set by anything. Rather
than rely on the installed php.ini to be correct, it seems safer to pass
-n, and any tests that need specific config can pass $iniEntries.

Closes GH-11373
This commit is contained in:
Tim Starling 2023-06-05 10:43:19 +10:00 • committed by Jakub Zelenka
parent 1fa5d306d8
commit ea2ee60552
No known key found for this signature in database
GPG key ID: 1C0779DC5C0A9DE4
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sapi/fpm/tests/tester.inc
View file

@ -385,7 +385,7 @@ class Tester
public function testConfig($silent = false)
{
$configFile = $this->createConfig();
$cmd = self::findExecutable() . ' -tt -y ' . $configFile . ' 2>&1';
$cmd = self::findExecutable() . ' -n -tt -y ' . $configFile . ' 2>&1';
$this->trace('Testing config using command', $cmd, true);
exec($cmd, $output, $code);
if ($code) {
@ -426,7 +426,7 @@ class Tester
$configFile = $this->createConfig();
$desc = $this->outDesc ? [] : [1 => array('pipe', 'w'), 2 => array('redirect', 1)];
$cmd = [self::findExecutable(), '-y', $configFile];
$cmd = [self::findExecutable(), '-n', '-y', $configFile];
if ($forceStderr) {
$cmd[] = '-O';