diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-08-14 21:08:16 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-08-14 21:08:16 +0000 |
| commit | 2dbce548a85a2656c1d8311317ecca7947b36a25 (patch) | |
| tree | cfa3566c99ba829a9df62409bd21e5cafab0e34f | |
| parent | a3d3be5201d8d9b174ce42fc2ed1f4db563a1e67 (diff) | |
| download | php-git-2dbce548a85a2656c1d8311317ecca7947b36a25.tar.gz | |
fix previous patch
| -rwxr-xr-x | run-tests.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/run-tests.php b/run-tests.php index 060720656b..a7e978ef87 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1307,7 +1307,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']); @@ -1318,7 +1318,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 { @@ -1326,11 +1326,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 " |