- Fix writing faillog with redirected tests

This commit is contained in:
Marcus Boerger 2006-03-11 18:13:13 +00:00
parent aa4140d7c2
commit 2275036bd0

View File

@ -885,10 +885,21 @@ function run_all_tests($test_files, $env, $redir_tested = NULL)
}
foreach($test_files as $name)
{
if ($redir_tested) {
if (is_array($name))
{
$index = "# $name[1]: $name[0]";
if ($redir_tested)
{
$name = $name[0];
}
}
else if ($redir_tested)
{
$index = "# $redir_tested: $name";
} else {
$index = is_array($name) ? "# $name[1]: $name[0]" : $name;
}
else
{
$index = $name;
}
$unicode_semantics = $unicode_and_native ? 0 : ($unicode_testing ? 1 : 0);
for(; $unicode_semantics < ($unicode_testing ? 2 : 1); $unicode_semantics++)
@ -1217,7 +1228,9 @@ TEST $file
} else {
$GLOBALS['test_files'] = $test_files;
find_files($IN_REDIRECT['TESTS']);
$test_files = $GLOBALS['test_files'];
foreach($GLOBALS['test_files'] as $f) {
$test_files[] = array($f, $file);
}
}
$test_cnt += (count($test_files) - 1) * ($unicode_and_native ? 2 : 1);
$test_idx--;