mike Fri, 09 Mar 2012 19:51:09 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=324068
Log: merge 322758 (detect a php-cgi which is a sibling of php cli) Changed paths: _U php/php-src/branches/PHP_5_3/ U php/php-src/branches/PHP_5_3/run-tests.php _U php/php-src/branches/PHP_5_4/ U php/php-src/branches/PHP_5_4/run-tests.php Property changes on: php/php-src/branches/PHP_5_3 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/trunk:284726,305015,305018-305019 + /php/php-src/trunk:284726,305015,305018-305019,322758 Modified: php/php-src/branches/PHP_5_3/run-tests.php =================================================================== --- php/php-src/branches/PHP_5_3/run-tests.php 2012-03-09 18:38:18 UTC (rev 324067) +++ php/php-src/branches/PHP_5_3/run-tests.php 2012-03-09 19:51:09 UTC (rev 324068) @@ -1357,6 +1357,9 @@ } 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) { Property changes on: php/php-src/branches/PHP_5_4 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/trunk:284726,322419,322421,322423,322963 + /php/php-src/trunk:284726,322419,322421,322423,322758,322963 Modified: php/php-src/branches/PHP_5_4/run-tests.php =================================================================== --- php/php-src/branches/PHP_5_4/run-tests.php 2012-03-09 18:38:18 UTC (rev 324067) +++ php/php-src/branches/PHP_5_4/run-tests.php 2012-03-09 19:51:09 UTC (rev 324068) @@ -1357,6 +1357,9 @@ } 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) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php