mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-26 11:23:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

* work with sapi/cli

Browse Source
This commit is contained in:
Stig Bakken 2002-03-02 02:37:13 +00:00
parent 922ec7c75d
commit 8802148fcd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
run-tests.php
View File

@ -161,8 +161,10 @@ function initialize()
} }
} }
if (isset($GLOBALS["TOP_BUILDDIR"]) && @is_executable($GLOBALS["TOP_BUILDDIR"]."/php{$ext}")) { if (isset($_ENV["TOP_BUILDDIR"]) && @is_executable($_ENV["TOP_BUILDDIR"]."/sapi/cli/php{$ext}")) {
$php = $GLOBALS["TOP_BUILDDIR"]."/php{$ext}"; $php = $_ENV["TOP_BUILDDIR"]."/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}")) { } elseif (@is_executable("./php{$ext}")) {
$php = getcwd() . "/php{$ext}"; $php = getcwd() . "/php{$ext}";
} }
@ -241,7 +243,7 @@ function do_testing($argc, &$argv)
} }
} }
} else { } else {
// $dir = $GLOBALS["TOP_SRCDIR"]; // XXX ??? where should this variable be set? // $dir = $_ENV["TOP_SRCDIR"]; // XXX ??? where should this variable be set?
$dir=str_replace('\\','/',trim(($windows_p ? getenv("TEST_DIR"):`pwd`))); $dir=str_replace('\\','/',trim(($windows_p ? getenv("TEST_DIR"):`pwd`)));
} }
if (isset($dir) && $dir) { if (isset($dir) && $dir) {
@ -376,6 +378,10 @@ function run_tests_in_dir($dir = '.')
function skip_headers($fp) function skip_headers($fp)
{ {
// "cli" version of PHP does not output headers
if (php_sapi_name() == "cli") {
return;
}
while (!feof($fp)) { while (!feof($fp)) {
if (trim(fgets($fp, 1024)) == "") { if (trim(fgets($fp, 1024)) == "") {
break; break;
@ -538,7 +544,6 @@ function run_test($file)
delete_tmpfiles(); delete_tmpfiles();
return TEST_INTERNAL_ERROR; return TEST_INTERNAL_ERROR;
} }
//echo $cmd;
$cp = popen($cmd, "r"); $cp = popen($cmd, "r");
if (!$cp) { if (!$cp) {
dowriteln("Error: could not execute: $cmd"); dowriteln("Error: could not execute: $cmd");