mirror of
https://github.com/php/php-src.git
synced 2026-04-29 19:23:22 +02:00
Use CGI binary when CGI SAPI is there.
Make "php run-tests.php" work with cli SAPI. # Anyone mind if I change spaces to tabs? # Currently, it is using spaces and it's should use # tabs just like C source.
This commit is contained in:
+5
-3
@@ -161,12 +161,14 @@ function initialize()
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_ENV["TOP_BUILDDIR"]) && @is_executable($_ENV["TOP_BUILDDIR"]."/sapi/cli/php{$ext}")) {
|
||||
$php = $_ENV["TOP_BUILDDIR"]."/sapi/cli/php{$ext}";
|
||||
} elseif (isset($_ENV["TOP_BUILDDIR"]) && @is_executable($_ENV["TOP_BUILDDIR"]."/php{$ext}")) {
|
||||
if (isset($_ENV["TOP_BUILDDIR"]) && @is_executable($_ENV["TOP_BUILDDIR"]."/php{$ext}")) {
|
||||
$php = $_ENV["TOP_BUILDDIR"]."/php{$ext}";
|
||||
} elseif (isset($_ENV["TOP_BUILDDIR"]) && @is_executable($_ENV["TOP_BUILDDIR"]."/sapi/cli/php{$ext}")) {
|
||||
$php = $_ENV["TOP_BUILDDIR"]."/sapi/cli/php{$ext}";
|
||||
} elseif (@is_executable("./php{$ext}")) {
|
||||
$php = getcwd() . "/php{$ext}";
|
||||
} elseif (@is_executable("./sapi/cli/php{$ext}")) {
|
||||
$php = getcwd() . "/sapi/cli/php{$ext}";
|
||||
}
|
||||
if (empty($php)) {
|
||||
$php = in_path("php", $windows_p);
|
||||
|
||||
Reference in New Issue
Block a user