Permalink
Browse files

Merge branch 'PHP-5.4'

* PHP-5.4:
  Do not unload shared extensions when checking for leaks
  • Loading branch information...
2 parents 626effc + 5cf4f73 commit ac227f4ba9c26a0e41485edf9e51efc83f108258 @bjori bjori committed Jul 17, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 run-tests.php
View
@@ -1481,8 +1481,10 @@ function run_test($php, $file, $env)
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);
@@ -1749,6 +1751,7 @@ function run_test($php, $file, $env)
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 */
@@ -1759,6 +1762,7 @@ function run_test($php, $file, $env)
} else {
$env['USE_ZEND_ALLOC'] = '1';
+ $env['ZEND_DONT_UNLOAD_MODULES'] = 0;
}
if ($DETAILED) echo "

0 comments on commit ac227f4

Please sign in to comment.