diff options
| author | Michael Wallner <mike@php.net> | 2012-03-09 19:51:09 +0000 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2012-03-09 19:51:09 +0000 |
| commit | b39ffa3f34db2c8a656aca18377108f843db56c4 (patch) | |
| tree | a9b8c013731e3544239435a63421df314ac65854 /run-tests.php | |
| parent | b61f335b9da857e210248c13990bbae1b84174f1 (diff) | |
| download | php-git-b39ffa3f34db2c8a656aca18377108f843db56c4.tar.gz | |
merge 322758 (detect a php-cgi which is a sibling of php cli)
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/run-tests.php b/run-tests.php index 70c56b0698..893eb9b616 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1357,6 +1357,9 @@ TEST $file } else if (file_exists("./sapi/cgi/php-cgi")) { $old_php = $php; $php = realpath("./sapi/cgi/php-cgi") . ' -C '; + } else if (file_exists(dirname($php) . "/php-cgi")) { + $old_php = $php; + $php = realpath(dirname($php) . "/php-cgi") . ' -C '; } else { show_result('SKIP', $tested, $tested_file, "reason: CGI not available"); if ($JUNIT) { |