diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-05-27 19:23:09 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-05-27 19:23:09 +0000 |
| commit | ccd16d09c045f9fbce3bd14a4fd6814536b8e389 (patch) | |
| tree | 78fa05d37426bc4c66ef0919bae4e141f06d33c1 | |
| parent | bcc95ae09b316a71ee11788386dc6c1e8868c486 (diff) | |
| download | php-git-ccd16d09c045f9fbce3bd14a4fd6814536b8e389.tar.gz | |
MFH
| -rwxr-xr-x | run-tests.php | 6 | ||||
| -rw-r--r-- | sapi/cgi/tests/include.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/run-tests.php b/run-tests.php index c6bf1fce2f..952be2759c 100755 --- a/run-tests.php +++ b/run-tests.php @@ -115,7 +115,7 @@ if (getenv('TEST_PHP_EXECUTABLE')) { if (getenv('TEST_PHP_CGI_EXECUTABLE')) { $php_cgi = getenv('TEST_PHP_CGI_EXECUTABLE'); if ($php_cgi=='auto') { - $php_cgi = $cwd.'/sapi/cgi/php'; + $php_cgi = $cwd.'/sapi/cgi/php-cgi'; putenv("TEST_PHP_CGI_EXECUTABLE=$php_cgi"); } $environment['TEST_PHP_CGI_EXECUTABLE'] = $php_cgi; @@ -1051,9 +1051,9 @@ TEST $file } elseif (!strncasecmp(PHP_OS, "win", 3) && file_exists(dirname($php) ."/php-cgi.exe")) { $old_php = $php; $php = realpath(dirname($php) ."/php-cgi.exe") .' -C '; - } elseif (file_exists("./sapi/cgi/php")) { + } elseif (file_exists("./sapi/cgi/php-cgi")) { $old_php = $php; - $php = realpath("./sapi/cgi/php") . ' -C '; + $php = realpath("./sapi/cgi/php-cgi") . ' -C '; } else { show_result("SKIP", $tested, $tested_file, "reason: CGI not available"); return 'SKIPPED'; diff --git a/sapi/cgi/tests/include.inc b/sapi/cgi/tests/include.inc index 2a87321499..11bf8f3b81 100644 --- a/sapi/cgi/tests/include.inc +++ b/sapi/cgi/tests/include.inc @@ -30,9 +30,9 @@ function get_cgi_path() /* {{{ */ } } - if ($php_path && is_dir($php_path) && file_exists($php_path."/cgi/php") && is_executable($php_path."/cgi/php")) { + if ($php_path && is_dir($php_path) && file_exists($php_path."/cgi/php-cgi") && is_executable($php_path."/cgi/php-cgi")) { /* gotcha */ - return $php_path."/cgi/php"; + return $php_path."/cgi/php-cgi"; } return false; } |