cvs: php-src / run-tests.php

jani Thu Aug 14 23:29:59 2008 UTC Modified files: /php-src run-tests.php Log: - No unnecessary errors please http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.373&r2=1.374&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.373 php-src/run-tests.php:1.374 --- php-src/run-tests.php:1.373 Tue Aug 5 16:25:31 2008 +++ php-src/run-tests.php Thu Aug 14 23:29:59 2008 @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.373 2008/08/05 16:25:31 jani Exp $ */ +/* $Id: run-tests.php,v 1.374 2008/08/14 23:29:59 jani Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -389,7 +389,7 @@ } $failed_tests_data .= $sep . "PHPINFO" . $sep; - $failed_tests_data .= shell_exec($php . ' -dhtml_errors=0 -i'); + $failed_tests_data .= shell_exec($php . ' -ddisplay_errors=stderr -dhtml_errors=0 -i 2> /dev/null'); if ($just_save_results || !mail_qa_team($failed_tests_data, $compression, $status)) { file_put_contents($output_file, $failed_tests_data); @@ -608,7 +608,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.373 $' . "\n"; + echo '$Revision: 1.374 $' . "\n"; exit(1); default: @@ -1560,7 +1560,7 @@ } save_text($tmp_post, $request); - $cmd = "$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 if (array_key_exists('POST', $section_text) && !empty($section_text['POST'])) { @@ -1581,7 +1581,7 @@ $env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'; $env['CONTENT_LENGTH'] = $content_length; - $cmd = "$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 { @@ -1589,7 +1589,7 @@ $env['CONTENT_TYPE'] = ''; $env['CONTENT_LENGTH'] = ''; - $cmd = "$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) {