clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.3' into PHP-5.4

Browse Source 
* PHP-5.3:
  Do not unload shared extensions when checking for leaks
This commit is contained in:
Hannes Magnusson 2012-07-17 10:05:42 +01:00
commit 5cf4f7395b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
run-tests.php
View File

@ -1478,8 +1478,10 @@ TEST $file
if ($leak_check) {
$env['USE_ZEND_ALLOC'] = '0';
$env['ZEND_DONT_UNLOAD_MODULES'] = 1;
} else {
$env['USE_ZEND_ALLOC'] = '1';
$env['ZEND_DONT_UNLOAD_MODULES'] = 0;
}
junit_start_timer($shortname);
@ -1746,6 +1748,7 @@ TEST $file
if ($leak_check) {
$env['USE_ZEND_ALLOC'] = '0';
$env['ZEND_DONT_UNLOAD_MODULES'] = 1;
if ($valgrind_version >= 330) {
/* valgrind 3.3.0+ doesn't have --log-file-exactly option */
@ -1756,6 +1759,7 @@ TEST $file
} else {
$env['USE_ZEND_ALLOC'] = '1';
$env['ZEND_DONT_UNLOAD_MODULES'] = 0;
}
if ($DETAILED) echo "