summaryrefslogtreecommitdiff
path: root/run-tests.php
diff options
context:
space:
mode:
authorZoe Slattery <zoe@php.net>2008-12-31 17:32:54 +0000
committerZoe Slattery <zoe@php.net>2008-12-31 17:32:54 +0000
commit665ee392ef466ac5fe879782b8ac780f4afaf5be (patch)
tree49bc91d4e25da2d1d705820427e659e4b51333ed /run-tests.php
parent4c0a9448a950b676826ceeb1e203b62361a89dc3 (diff)
downloadphp-git-665ee392ef466ac5fe879782b8ac780f4afaf5be.tar.gz
Fixed bug #46845 Test expected to fail, but pass, don't cause error
Diffstat (limited to 'run-tests.php')
-rwxr-xr-xrun-tests.php25
1 files changed, 18 insertions, 7 deletions
diff --git a/run-tests.php b/run-tests.php
index d8f0acc538..0c2ecb942d 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -1786,10 +1786,16 @@ COMMAND $cmd
if (isset($old_php)) {
$php = $old_php;
}
- if (!$leaked && !$failed_headers) {
- show_result("PASS", $tested, $tested_file, '', $temp_filenames);
- return 'PASSED';
- }
+
+ 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';
+ }
+ }
}
} else {
@@ -1810,9 +1816,14 @@ COMMAND $cmd
$php = $old_php;
}
- if (!$leaked && !$failed_headers) {
- show_result("PASS", $tested, $tested_file, '', $temp_filenames);
- return 'PASSED';
+ 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';
+ }
}
}