]> granicus.if.org Git - php/commitdiff
fix my previous patch
authorAntony Dovgal <tony2001@php.net>
Mon, 14 Aug 2006 21:08:02 +0000 (21:08 +0000)
committerAntony Dovgal <tony2001@php.net>
Mon, 14 Aug 2006 21:08:02 +0000 (21:08 +0000)
run-tests.php

index 212943e812ba9ed825416aa6e5d02d101ee6ef2a..ad182db8a0986d137f5cb6b5b199a3659b1e250b 100755 (executable)
@@ -1360,7 +1360,7 @@ TEST $file
                        return 'BORKED';
                }
                save_text($tmp_post, $request);
-               $cmd = "USE_ZEND_ALLOC=1 $php$pass_options$ini_settings -f \"$test_file\" 2>&1 < $tmp_post";
+               $cmd = "$php$pass_options$ini_settings -f \"$test_file\" 2>&1 < $tmp_post";
        } elseif (array_key_exists('POST', $section_text) && !empty($section_text['POST'])) {
 
                $post = trim($section_text['POST']);
@@ -1371,7 +1371,7 @@ TEST $file
                $env['CONTENT_TYPE']   = 'application/x-www-form-urlencoded';
                $env['CONTENT_LENGTH'] = $content_length;
 
-               $cmd = "USE_ZEND_ALLOC=1 $php$pass_options$ini_settings -f \"$test_file\" 2>&1 < $tmp_post";
+               $cmd = "$php$pass_options$ini_settings -f \"$test_file\" 2>&1 < $tmp_post";
 
        } else {
 
@@ -1379,11 +1379,13 @@ TEST $file
                $env['CONTENT_TYPE']   = '';
                $env['CONTENT_LENGTH'] = '';
 
-               $cmd = "USE_ZEND_ALLOC=1 $php$pass_options$ini_settings -f \"$test_file\" $args 2>&1";
+               $cmd = "$php$pass_options$ini_settings -f \"$test_file\" $args 2>&1";
        }
 
        if ($leak_check) {
                $cmd = "USE_ZEND_ALLOC=0 valgrind -q --tool=memcheck --trace-children=yes --log-file-exactly=$memcheck_filename $cmd";
+       } else {
+               $cmd = "USE_ZEND_ALLOC=1 ".$cmd;
        }
 
        if ($DETAILED) echo "