cvs: php-src / run-tests.php
| From: | Antony Dovgal | Date: | Wed, 02 May 2007 15:25:32 +0000 |
| Subject: | cvs: php-src / run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-44142@lists.php.net to get a copy of this message | ||
tony2001 Wed May 2 15:25:32 2007 UTC
Modified files:
/php-src run-tests.php
Log:
make USE_ZEND_ALLOC env var available in SKIPIF section
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.320&r2=1.321&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.320 php-src/run-tests.php:1.321
--- php-src/run-tests.php:1.320 Mon Apr 23 20:55:56 2007
+++ php-src/run-tests.php Wed May 2 15:25:32 2007
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.320 2007/04/23 20:55:56 johannes Exp $ */
+/* $Id: run-tests.php,v 1.321 2007/05/02 15:25:32 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
@@ -405,7 +405,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.320 $'."\n";
+ echo '$Revision: 1.321 $'."\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -1215,6 +1215,12 @@
$ini_settings .= " -dunicode.semantics=" . (int)$unicode_test;
+ if ($leak_check) {
+ $env['USE_ZEND_ALLOC'] = '0';
+ } else {
+ $env['USE_ZEND_ALLOC'] = '1';
+ }
+
$output = system_with_timeout("$extra $php -q $ini_settings $test_skipif", $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);