pajoye Wed Jul 2 12:47:06 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src run-tests.php
Log:
- MFH: fix make test TESTS=... and dynamic extension usage on windows
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.26&r2=1.226.2.37.2.35.2.27&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.26
php-src/run-tests.php:1.226.2.37.2.35.2.27
--- php-src/run-tests.php:1.226.2.37.2.35.2.26 Tue Jun 24 06:05:29 2008
+++ php-src/run-tests.php Wed Jul 2 12:47:06 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.26 2008/06/24 06:05:29 dmitry Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.27 2008/07/02 12:47:06 pajoye 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
@@ -447,7 +447,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.26
$'."\n";
+ echo '$Revision: 1.226.2.37.2.35.2.27
$'."\n";
exit(1);
case 'u':
@@ -550,7 +550,11 @@
}
if (strlen($conf_passed))
{
- $pass_options .= " -c '$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);
$test_files = array_merge($test_files, $redir_tests);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
