MFH

diff --git a/run-tests.php b/run-tests.php
index c6bf1fce2f30536430692c46164c21232a1707cd..952be2759c90dcedfee1a775440c32d19b6c58b5 100755 (executable)
--- 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 2a873214992219e7120bdeb8debb91008b518107..11bf8f3b81a203bfdbb4039410e71efeae720204 100644 (file)
--- 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;
        }