tony2001 Sun May 27 19:23:09 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src run-tests.php
/php-src/sapi/cgi/tests include.inc
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.28&r2=1.226.2.37.2.29&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.28
php-src/run-tests.php:1.226.2.37.2.29
--- php-src/run-tests.php:1.226.2.37.2.28 Mon May 7 18:40:33 2007
+++ php-src/run-tests.php Sun May 27 19:23:09 2007
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.28 2007/05/07 18:40:33 iliaa Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.29 2007/05/27 19:23:09 tony2001 Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -115,7 +115,7 @@
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;
@@ -398,7 +398,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.28
$'."\n";
+ echo '$Revision: 1.226.2.37.2.29
$'."\n";
exit(1);
default:
echo "Illegal switch '$switch'
specified!\n";
@@ -1051,9 +1051,9 @@
} 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';
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/include.inc?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/sapi/cgi/tests/include.inc
diff -u php-src/sapi/cgi/tests/include.inc:1.1.2.2
php-src/sapi/cgi/tests/include.inc:1.1.2.3
--- php-src/sapi/cgi/tests/include.inc:1.1.2.2 Tue Apr 17 19:49:26 2007
+++ php-src/sapi/cgi/tests/include.inc Sun May 27 19:23:09 2007
@@ -30,9 +30,9 @@
}
}
- 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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
