diff options
| author | Hannes Magnusson <bjori@10gen.com> | 2012-07-17 10:06:02 +0100 |
|---|---|---|
| committer | Hannes Magnusson <bjori@10gen.com> | 2012-07-17 10:06:02 +0100 |
| commit | ac227f4ba9c26a0e41485edf9e51efc83f108258 (patch) | |
| tree | 6e1dae4fd4953cce660320aa8253918a61b7bbd6 /run-tests.php | |
| parent | 626effcf1736f7f14e1c01ec52d62a55cf70cd9d (diff) | |
| parent | 5cf4f7395b9b61d32c41e8a5cbabd8003cc2bc2b (diff) | |
| download | php-git-ac227f4ba9c26a0e41485edf9e51efc83f108258.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Do not unload shared extensions when checking for leaks
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/run-tests.php b/run-tests.php index 3997a067c7..86527e12ae 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1481,8 +1481,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); @@ -1749,6 +1751,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 */ @@ -1759,6 +1762,7 @@ TEST $file } else { $env['USE_ZEND_ALLOC'] = '1'; + $env['ZEND_DONT_UNLOAD_MODULES'] = 0; } if ($DETAILED) echo " |