tony2001 Sun May 27 19:22:24 2007 UTC
Modified files:
/php-src run-tests.php
/php-src/sapi/cgi/tests include.inc
Log:
"sapi/cgi/php" -> "sapi/cgi/php-cgi"
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.323&r2=1.324&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.323 php-src/run-tests.php:1.324
--- php-src/run-tests.php:1.323 Sun May 20 18:29:43 2007
+++ php-src/run-tests.php Sun May 27 19:22:24 2007
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.323 2007/05/20 18:29:43 helly Exp $ */
+/* $Id: run-tests.php,v 1.324 2007/05/27 19:22:24 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
@@ -105,7 +105,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;
@@ -406,7 +406,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.323 $'."\n";
+ echo '$Revision: 1.324 $'."\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -1078,9 +1078,9 @@
if (!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,
$unicode_semantics, "reason: CGI not available");
return 'SKIPPED';
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/include.inc?r1=1.1&r2=1.2&diff_format=u
Index: php-src/sapi/cgi/tests/include.inc
diff -u php-src/sapi/cgi/tests/include.inc:1.1
php-src/sapi/cgi/tests/include.inc:1.2
--- php-src/sapi/cgi/tests/include.inc:1.1 Tue Apr 17 19:48:22 2007
+++ php-src/sapi/cgi/tests/include.inc Sun May 27 19:22:24 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
