]> granicus.if.org Git - php/commitdiff
Don't force USE_ZEND_ALLOC=0 in run-tests.php
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 24 Jun 2019 13:41:03 +0000 (15:41 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 25 Jun 2019 08:25:44 +0000 (10:25 +0200)
USE_ZEND_ALLOC=0 is useful not just for valgrind ... we should not
force USE_ZEND_ALLOC=1 if the user explicitly disabled it.

run-tests.php

index 50db361634d42332cbb7fcb429b56ad879c989d6..9d20304c25f08457db39b344cd2bcd6912867c49 100755 (executable)
@@ -2140,9 +2140,6 @@ TEST $file
                        if ($valgrind) {
                                $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);
@@ -2444,9 +2441,6 @@ TEST $file
                $env['ZEND_DONT_UNLOAD_MODULES'] = 1;
 
                $cmd = $valgrind->wrapCommand($cmd, $memcheck_filename, strpos($test_file, "pcre") !== false);
-       } else {
-               $env['USE_ZEND_ALLOC'] = '1';
-               $env['ZEND_DONT_UNLOAD_MODULES'] = 0;
        }
 
        if ($DETAILED) echo "