cvs: php4 / run-tests.php
| From: | Wez Furlong | Date: | Sun, 17 Mar 2002 13:16:36 +0000 |
| Subject: | cvs: php4 / run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10286@lists.php.net to get a copy of this message | ||
wez Sun Mar 17 08:16:36 2002 EDT
Modified files:
/php4 run-tests.php
Log:
fix problems with cgi/cli sapi when running tests
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.37 php4/run-tests.php:1.38
--- php4/run-tests.php:1.37 Tue Mar 12 01:43:14 2002
+++ php4/run-tests.php Sun Mar 17 08:16:35 2002
@@ -161,15 +161,21 @@
}
}
- 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}")) {
+/* Lets check for cli first, since the new build system runs the cli sapi,
+ and this script makes assumptions about the executeable based on things
+ it determines from *this* instance. If the sapis are not the same, tests
+ will fail due to silly things like headers not being ignored in the right
+ places */
+
+ if (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}";
- }
+ } elseif (isset($_ENV["TOP_BUILDDIR"]) &&
@is_executable($_ENV["TOP_BUILDDIR"]."/php{$ext}")) {
+ $php = $_ENV["TOP_BUILDDIR"]."/php{$ext}";
+ } elseif (@is_executable("./php{$ext}")) {
+ $php = getcwd() . "/php{$ext}";
+ }
// Test result can be bogus, if we use php binary in path. - yohgaki@php.net
// if (empty($php)) {
// $php = in_path("php", $windows_p);