Fixed bug #46845 Test expected to fail, but pass, don't cause error

This commit is contained in:
Zoe Slattery 2008-12-31 17:32:54 +00:00
parent 4c0a9448a9
commit 665ee392ef

View File

@ -1786,10 +1786,16 @@ COMMAND $cmd
if (isset($old_php)) { if (isset($old_php)) {
$php = $old_php; $php = $old_php;
} }
if (!$leaked && !$failed_headers) {
show_result("PASS", $tested, $tested_file, '', $temp_filenames); if (!$leaked && !$failed_headers) {
return 'PASSED'; 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';
}
}
} }
} else { } else {
@ -1810,9 +1816,14 @@ COMMAND $cmd
$php = $old_php; $php = $old_php;
} }
if (!$leaked && !$failed_headers) { if (!$leaked && !$failed_headers) {
show_result("PASS", $tested, $tested_file, '', $temp_filenames); if (isset($section_text['XFAIL'] )) {
return 'PASSED'; $warn = true;
$info = " (warn: XFAIL section but test passes)";
}else {
show_result("PASS", $tested, $tested_file, '', $temp_filenames);
return 'PASSED';
}
} }
} }