]> granicus.if.org Git - php/commitdiff
Do not unload shared extensions when checking for leaks
authorHannes Magnusson <bjori@10gen.com>
Tue, 17 Jul 2012 09:04:56 +0000 (10:04 +0100)
committerHannes Magnusson <bjori@10gen.com>
Tue, 17 Jul 2012 09:04:56 +0000 (10:04 +0100)
run-tests.php

index 302167a6e5c5d3f5f4e4bddd7ec74c6f04b895dd..cfc562ebc15dedd268fa9aade4cc3e4350da4d42 100755 (executable)
@@ -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 "