andrey Tue, 11 May 2010 15:27:03 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=299250
Log: 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 Bug: http://bugs.php.net/51712 (Open) Test mysql_mysqlnd_read_timeout_long must fail on MySQL4 Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt 2010-05-11 15:07:31 UTC (rev 299249) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt 2010-05-11 15:27:03 UTC (rev 299250) @@ -3,8 +3,11 @@ --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 Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt 2010-05-11 15:07:31 UTC (rev 299249) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt 2010-05-11 15:27:03 UTC (rev 299250) @@ -3,8 +3,11 @@ --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 Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt 2010-05-11 15:07:31 UTC (rev 299249) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt 2010-05-11 15:27:03 UTC (rev 299250) @@ -3,8 +3,11 @@ --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 Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt 2010-05-11 15:07:31 UTC (rev 299249) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt 2010-05-11 15:27:03 UTC (rev 299250) @@ -3,8 +3,11 @@ --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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
