mirror of
https://github.com/php/php-src.git
synced 2025-08-16 22:18:50 +02:00
Fixed bug #46845 Test expected to fail, but pass, don't cause error
This commit is contained in:
parent
88f19296c9
commit
89743669d2
1 changed files with 11 additions and 0 deletions
|
@ -1786,11 +1786,17 @@ COMMAND $cmd
|
||||||
if (isset($old_php)) {
|
if (isset($old_php)) {
|
||||||
$php = $old_php;
|
$php = $old_php;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$leaked && !$failed_headers) {
|
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);
|
show_result("PASS", $tested, $tested_file, '', $temp_filenames);
|
||||||
return 'PASSED';
|
return 'PASSED';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
@ -1811,10 +1817,15 @@ COMMAND $cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$leaked && !$failed_headers) {
|
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);
|
show_result("PASS", $tested, $tested_file, '', $temp_filenames);
|
||||||
return 'PASSED';
|
return 'PASSED';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$wanted_re = null;
|
$wanted_re = null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue