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

Fix #81520 TEST_PHP_CGI_EXECUTABLE badly set in run-tests.php

Browse source
This commit is contained in:
Remi Collet 2021-10-12 13:33:16 +02:00
parent ebaed43473
commit 3fb1cf24c3
No known key found for this signature in database
GPG key ID: DC9FF8D3EE5AF27F
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
run-tests.php
View file

@ -1057,11 +1057,14 @@ function get_binary(string $php, string $sapi, string $sapi_path): ?string
if (IS_WINDOWS && file_exists("$dir/$sapi.exe")) { if (IS_WINDOWS && file_exists("$dir/$sapi.exe")) {
return realpath("$dir/$sapi.exe"); return realpath("$dir/$sapi.exe");
} }
// Sources tree
if (file_exists("$dir/../../$sapi_path")) { if (file_exists("$dir/../../$sapi_path")) {
return realpath("$dir/../../$sapi_path"); return realpath("$dir/../../$sapi_path");
} }
if (file_exists("$dir/$sapi")) { // Installation tre, preserve command prefix/suffix
return realpath("$dir/$sapi"); $inst = str_replace('php', $sapi, basename($php));
if (file_exists("$dir/$inst")) {
return realpath("$dir/$inst");
} }
return null; return null;
} }