cvs: php-src / run-tests.php

helly Sat Mar 11 17:57:40 2006 UTC Modified files: /php-src run-tests.php Log: - Fix test results with redirected tests http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.282&r2=1.283&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.282 php-src/run-tests.php:1.283 --- php-src/run-tests.php:1.282 Sat Mar 11 16:54:11 2006 +++ php-src/run-tests.php Sat Mar 11 17:57:40 2006 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.282 2006/03/11 16:54:11 helly Exp $ */ +/* $Id: run-tests.php,v 1.283 2006/03/11 17:57:40 helly 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 @@ -390,7 +390,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.282 $'."\n"; + echo '$Revision: 1.283 $'."\n"; exit(1); default: echo "Illegal switch specified!\n"; @@ -883,9 +883,13 @@ { $test_cnt *= 2; } - foreach($test_files AS $name) + foreach($test_files as $name) { - $index = is_array($name) ? $name[0] : $name; + if ($redir_tested) { + $index = "# $redir_tested: $name"; + } else { + $index = is_array($name) ? "# $name[1]: $name[0]" : $name; + } $unicode_semantics = $unicode_and_native ? 0 : ($unicode_testing ? 1 : 0); for(; $unicode_semantics < ($unicode_testing ? 2 : 1); $unicode_semantics++) { @@ -897,12 +901,7 @@ $test_results[$index.$pu] = $result; if ($failed_tests_file && ($result == 'FAILED' || $result == 'WARNED' || $result == 'LEAKED')) { - if ($redir_tested) - { - fwrite($failed_tests_file, "# $redir_tested: $name\n"); - } else { - fwrite($failed_tests_file, "$name\n"); - } + fwrite($failed_tests_file, "$index\n"); } } if ($result == 'REDIR')