zoe Wed Dec 31 17:37:21 2008 UTC Modified files: (Branch: PHP_5_2) /php-src run-tests.php Log: Fixed bug #46845 Test expected to fail, but pass, don't cause error http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.56&r2=1.226.2.37.2.57&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.56 php-src/run-tests.php:1.226.2.37.2.57 --- php-src/run-tests.php:1.226.2.37.2.56 Wed Dec 31 11:17:31 2008 +++ php-src/run-tests.php Wed Dec 31 17:37:21 2008 @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.56 2008/12/31 11:17:31 sebastian Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.57 2008/12/31 17:37:21 zoe 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 @@ -617,7 +617,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.56 $' . "\n"; + echo '$Revision: 1.226.2.37.2.57 $' . "\n"; exit(1); default: @@ -1786,9 +1786,15 @@ if (isset($old_php)) { $php = $old_php; } - if (!$leaked && !$failed_headers) { - show_result("PASS", $tested, $tested_file, '', $temp_filenames); - return 'PASSED'; + + if (!$leaked && !$failed_headers) { + if (isset($section_text['XFAIL'] )) { + $warn = true; + $info = " (warn: XFAIL section but test passes)"; + }else { + show_result("PASS", $tested, $tested_file, '', $temp_filenames); + return 'PASSED'; + } } } @@ -1810,9 +1816,14 @@ $php = $old_php; } - if (!$leaked && !$failed_headers) { - show_result("PASS", $tested, $tested_file, '', $temp_filenames); - return 'PASSED'; + if (!$leaked && !$failed_headers) { + if (isset($section_text['XFAIL'] )) { + $warn = true; + $info = " (warn: XFAIL section but test passes)"; + }else { + show_result("PASS", $tested, $tested_file, '', $temp_filenames); + return 'PASSED'; + } } }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php