tony2001 Thu Jul 3 10:24:44 2008 UTC
Modified files:
/php-src run-tests.php
Log:
fix run-tests.php failure when no custom php.ini passed
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.359&r2=1.360&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.359 php-src/run-tests.php:1.360
--- php-src/run-tests.php:1.359 Wed Jul 2 15:01:08 2008
+++ php-src/run-tests.php Thu Jul 3 10:24:44 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.359 2008/07/02 15:01:08 ohill Exp $ */
+/* $Id: run-tests.php,v 1.360 2008/07/03 10:24:44 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
@@ -445,7 +445,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.359 $' . "\n";
+ echo '$Revision: 1.360 $' . "\n";
exit(1);
default:
echo "Illegal switch '$switch'
specified!\n";
@@ -544,10 +544,12 @@
}
}
- if (substr(PHP_OS, 0, 3) != "WIN") {
- $pass_options .= " -c " . escapeshellarg($conf_passed);
- } else {
- $pass_options .= " -c '$conf_passed'";
+ if (strlen($conf_passed)) {
+ if (substr(PHP_OS, 0, 3) != "WIN") {
+ $pass_options .= " -c " . escapeshellarg($conf_passed);
+ } else {
+ $pass_options .= " -c '$conf_passed'";
+ }
}
$test_files = array_unique($test_files);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
