From 7457b8a7ed0ed8a9664a41e4a313da3cd70d4ca1 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Tue, 12 Mar 2002 05:18:25 +0000 Subject: [PATCH] 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. --- run-tests.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/run-tests.php b/run-tests.php index 9f76c388bf..ff8626fa75 100755 --- a/run-tests.php +++ b/run-tests.php @@ -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); -- 2.50.1