From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 24 Jun 2019 13:41:03 +0000 (+0200)
Subject: Don't force USE_ZEND_ALLOC=0 in run-tests.php
X-Git-Tag: php-7.4.0alpha2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a36e68c49f2e0e850494e56e6aa60ccf296c712;p=php

Don't force USE_ZEND_ALLOC=0 in run-tests.php

USE_ZEND_ALLOC=0 is useful not just for valgrind ... we should not
force USE_ZEND_ALLOC=1 if the user explicitly disabled it.
---

diff --git a/run-tests.php b/run-tests.php
index 50db361634..9d20304c25 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -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 "