summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoe Slattery <zoe@php.net>2008-12-31 17:35:50 +0000
committerZoe Slattery <zoe@php.net>2008-12-31 17:35:50 +0000
commit89743669d2b9284812a293be65eda3eeb27ff268 (patch)
treed9920dff74984ef64d3819db6ecbc006bee08031
parent88f19296c9417cc6076af18c256de29c35edd0f4 (diff)
downloadphp-git-89743669d2b9284812a293be65eda3eeb27ff268.tar.gz
Fixed bug #46845 Test expected to fail, but pass, don't cause error
-rwxr-xr-xrun-tests.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/run-tests.php b/run-tests.php
index d8f0acc538..f1726e8485 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -1786,9 +1786,15 @@ COMMAND $cmd
if (isset($old_php)) {
$php = $old_php;
}
+
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';
+ }
}
}
@@ -1811,8 +1817,13 @@ COMMAND $cmd
}
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';
+ }
}
}