tony2001 Mon Aug 14 21:08:16 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src run-tests.php
Log:
fix previous patch
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.11&r2=1.226.2.37.2.12&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.11
php-src/run-tests.php:1.226.2.37.2.12
--- php-src/run-tests.php:1.226.2.37.2.11 Mon Aug 14 10:29:20 2006
+++ php-src/run-tests.php Mon Aug 14 21:08:16 2006
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.11 2006/08/14 10:29:20 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.12 2006/08/14 21:08:16 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
@@ -397,7 +397,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.11
$'."\n";
+ echo '$Revision: 1.226.2.37.2.12
$'."\n";
exit(1);
default:
echo "Illegal switch '$switch'
specified!\n";
@@ -1307,7 +1307,7 @@
return 'BORKED';
}
save_text($tmp_post, $request);
- $cmd = "USE_ZEND_ALLOC=1 $php$pass_options$ini_settings -f
\"$test_file\" 2>&1 < $tmp_post";
+ $cmd = "$php$pass_options$ini_settings -f \"$test_file\" 2>&1 <
$tmp_post";
} elseif (array_key_exists('POST', $section_text) &&
!empty($section_text['POST'])) {
$post = trim($section_text['POST']);
@@ -1318,7 +1318,7 @@
$env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
$env['CONTENT_LENGTH'] = $content_length;
- $cmd = "USE_ZEND_ALLOC=1 $php$pass_options$ini_settings -f
\"$test_file\" 2>&1 < $tmp_post";
+ $cmd = "$php$pass_options$ini_settings -f \"$test_file\" 2>&1 <
$tmp_post";
} else {
@@ -1326,11 +1326,13 @@
$env['CONTENT_TYPE'] = '';
$env['CONTENT_LENGTH'] = '';
- $cmd = "USE_ZEND_ALLOC=1 $php$pass_options$ini_settings -f
\"$test_file\" $args 2>&1";
+ $cmd = "$php$pass_options$ini_settings -f \"$test_file\" $args
2>&1";
}
if ($leak_check) {
$cmd = "USE_ZEND_ALLOC=0 valgrind -q --tool=memcheck
--trace-children=yes --log-file-exactly=$memcheck_filename $cmd";
+ } else {
+ $cmd = "USE_ZEND_ALLOC=1 ".$cmd;
}
if ($DETAILED) echo "
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
