]> granicus.if.org Git - php/commitdiff
Fixed bug #46845 Test expected to fail, but pass, don't cause error
authorZoe Slattery <zoe@php.net>
Wed, 31 Dec 2008 17:37:21 +0000 (17:37 +0000)
committerZoe Slattery <zoe@php.net>
Wed, 31 Dec 2008 17:37:21 +0000 (17:37 +0000)
run-tests.php

index d8f0acc538086a048ba73f23df78599465f53e3d..993065ef5d48462a27e3d24535ca75b23ed7d8fe 100755 (executable)
@@ -1786,9 +1786,15 @@ 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';
+                            }
                        }
                }
 
@@ -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';
+                            }
                        }
                }