cvs: php4 / run-tests.php
| From: | Yasuo Ohgaki | Date: | Tue, 12 Mar 2002 05:18:26 +0000 |
| Subject: | cvs: php4 / run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9922@lists.php.net to get a copy of this message | ||
yohgaki Tue Mar 12 00:18:26 2002 EDT
Modified files:
/php4 run-tests.php
Log:
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.
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.34 php4/run-tests.php:1.35
--- php4/run-tests.php:1.34 Fri Mar 1 21:37:13 2002
+++ php4/run-tests.php Tue Mar 12 00:18:25 2002
@@ -161,12 +161,14 @@
}
}
- 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);