diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-06-29 09:49:21 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-06-29 09:49:21 +0000 |
| commit | e45dab8c49ab78bf77175be241076e8cd578b3e9 (patch) | |
| tree | c3ae3171bd4f9f8331335bbefa488aed12c2e846 | |
| parent | 9f4ff35af0468d3f53ff334829f3d4c40f4819c3 (diff) | |
| download | php-git-e45dab8c49ab78bf77175be241076e8cd578b3e9.tar.gz | |
Fixed CGI tests
| -rwxr-xr-x | run-tests.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/run-tests.php b/run-tests.php index b9a22ffb35..647d337a1e 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1052,12 +1052,17 @@ 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-cgi")) { - $old_php = $php; - $php = realpath("./sapi/cgi/php-cgi") . ' -C '; } else { - show_result("SKIP", $tested, $tested_file, "reason: CGI not available"); - return 'SKIPPED'; + if (file_exists(dirname($php)."/../../sapi/cgi/php-cgi")) { + $old_php = $php; + $php = realpath(dirname($php)."/../../sapi/cgi/php-cgi") . ' -C '; + } else if (file_exists("./sapi/cgi/php-cgi")) { + $old_php = $php; + $php = realpath("./sapi/cgi/php-cgi") . ' -C '; + } else { + show_result("SKIP", $tested, $tested_file, "reason: CGI not available"); + return 'SKIPPED'; + } } } |