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

diff --git a/run-tests.php b/run-tests.php
index d8f0acc538086a048ba73f23df78599465f53e3d..f1726e84855db6c6557f274bfb3420da191e6c28 100755 (executable)
--- 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';
+                              }
                        }
                }