summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2010-05-11 15:27:03 +0000
committerAndrey Hristov <andrey@php.net>2010-05-11 15:27:03 +0000
commit98585ccb37673e3e60d9c0b44687c606b7333d0d (patch)
tree093807b535d61a975edff0765a9cd98a59e50f7a
parentbce8aae0804d7cc95c5ac9cf58d30042e8b2fe53 (diff)
downloadphp-git-98585ccb37673e3e60d9c0b44687c606b7333d0d.tar.gz
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
-rw-r--r--ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt5
-rw-r--r--ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt5
2 files changed, 8 insertions, 2 deletions
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
index 637fd1629e..20a4e661ab 100644
--- 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 f5a13c5f63..171c806b91 100644
--- 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