diff options
| author | Hannes Magnusson <bjori@10gen.com> | 2012-07-17 10:05:42 +0100 |
|---|---|---|
| committer | Hannes Magnusson <bjori@10gen.com> | 2012-07-17 10:05:42 +0100 |
| commit | 5cf4f7395b9b61d32c41e8a5cbabd8003cc2bc2b (patch) | |
| tree | 0aa971d159cabba578c9937b1c3f1facb22e45c6 | |
| parent | c8f285d190f6a970ac156d7f704496aa06d33e66 (diff) | |
| parent | 88f7f3c00fba1aea5e5ca7d0f01b31bc2e8bf275 (diff) | |
| download | php-git-5cf4f7395b9b61d32c41e8a5cbabd8003cc2bc2b.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Do not unload shared extensions when checking for leaks
| -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 302167a6e5..cfc562ebc1 100755 --- a/run-tests.php +++ b/run-tests.php @@ -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 " |