merge 322758 (detect a php-cgi which is a sibling of php cli)

diff --git a/run-tests.php b/run-tests.php
index 70c56b06987b0b55baf96c24f0137298b22afd60..893eb9b616a034dc8c196afdaf113c97c9aaa3e6 100755 (executable)
--- 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) {