These tests should be run only if mysqli uses mysqlnd. Part of fix for

Bug #51712 Test mysql_mysqlnd_read_timeout_long must fail on MySQL4

diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
index 637fd1629e48e06024b352c6323963645c305008..20a4e661ab3431808e9dd39758fbb35a2743d1a2 100644 (file)
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
@@ -3,8 +3,11 @@ mysqlnd.net_read_timeout > default_socket_timeout
 --SKIPIF--
 <?php
 require_once('skipif.inc');
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
-require_once('connect.inc');
+
+if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
+        die("skip: test applies only to mysqlnd");
 ?>
 --INI--
 default_socket_timeout=1

diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
index f5a13c5f63ecdefd5d55bc0fea55dc625e509b45..171c806b91a745b051368e6ceee9a983d621cc64 100644 (file)
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
@@ -3,8 +3,11 @@ mysqlnd.net_read_timeout = 0
 --SKIPIF--
 <?php
 require_once('skipif.inc');
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
-require_once('connect.inc');
+
+if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
+        die("skip: test applies only to mysqlnd");
 ?>
 --INI--
 default_socket_timeout=10