From 7dae7c4a9b78a6ef21dae9679ce93a1f4c1c8aff Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sat, 17 Aug 2024 18:56:10 +0200
Subject: [PATCH] Don't skip tests which are supposed to fail; mark them as
 xfail

Especially regarding buggy server behavior, we should not skip those
tests, because it is unlikely that fixes to the server's behavior will
even be noticed.  Instead we mark these tests as xfail, so we get a
warning if the test succeeds, and can act appropriately.
---
 ext/mysqli/tests/mysqli_change_user_get_lock.phpt          | 3 ++-
 ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt   | 3 ++-
 ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt        | 3 ++-
 ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ext/mysqli/tests/mysqli_change_user_get_lock.phpt b/ext/mysqli/tests/mysqli_change_user_get_lock.phpt
index 3026cb369b317..a4442edb5279a 100644
--- a/ext/mysqli/tests/mysqli_change_user_get_lock.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_get_lock.phpt
@@ -5,8 +5,9 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-die("skip - is the server still buggy?");
 ?>
+--XFAIL--
+The server is still buggy
 --INI--
 max_execution_time=240
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt
index 36f5ec0329ca3..6d0789b90b45d 100644
--- a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt
@@ -5,8 +5,9 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-die("skip - is the server still buggy?");
 ?>
+--XFAIL--
+The server is still buggy
 --FILE--
 <?php
     require_once 'connect.inc';
diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
index d125d5d1e8917..5e5a3ddf0d76b 100644
--- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
@@ -5,8 +5,9 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-die("SKIP: prefetch isn't supported at the moment");
 ?>
+--XFAIL--
+prefetch isn't supported at the moment
 --FILE--
 <?php
     require 'table.inc';
diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
index fa1e6264107ba..cdcd3121b2308 100644
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
@@ -5,9 +5,9 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.php?id=42490");
 ?>
+--XFAIL--
+http://bugs.mysql.com/bug.php?id=42490
 --FILE--
 <?php
     require 'table.inc';