tyrael Thu, 08 Sep 2011 11:30:58 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=316413
Log: skip these tests if can't connect to mysql Changed paths: U php/php-src/branches/PHP_5_3/ext/mysql/tests/001.phpt U php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_connect.phpt U php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_max_links.phpt U php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_sql_safe_mode.phpt U php/php-src/branches/PHP_5_4/ext/mysql/tests/001.phpt U php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_connect.phpt U php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_max_links.phpt U php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_sql_safe_mode.phpt U php/php-src/trunk/ext/mysql/tests/001.phpt U php/php-src/trunk/ext/mysql/tests/mysql_connect.phpt U php/php-src/trunk/ext/mysql/tests/mysql_max_links.phpt U php/php-src/trunk/ext/mysql/tests/mysql_sql_safe_mode.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/001.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysql/tests/001.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/branches/PHP_5_3/ext/mysql/tests/001.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -1,7 +1,10 @@ --TEST-- mysql connect --SKIPIF-- -<?php include 'skipif.inc'; ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php require_once('connect.inc'); Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_connect.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_connect.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_connect.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -1,7 +1,10 @@ --TEST-- mysql_connect() --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include_once "connect.inc"; Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_max_links.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_max_links.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_max_links.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -3,6 +3,7 @@ --SKIPIF-- <?php require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); ?> --INI-- mysql.max_links=2 Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_sql_safe_mode.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_sql_safe_mode.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_sql_safe_mode.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -3,6 +3,7 @@ --SKIPIF-- <?php require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); $link = @mysql_connect("", "", "", true); if ($link) die("skip Test cannot be run if annonymous connections are allowed"); Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/001.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysql/tests/001.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/branches/PHP_5_4/ext/mysql/tests/001.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -1,7 +1,10 @@ --TEST-- mysql connect --SKIPIF-- -<?php include 'skipif.inc'; ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php require_once('connect.inc'); Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_connect.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_connect.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_connect.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -1,7 +1,10 @@ --TEST-- mysql_connect() --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include_once "connect.inc"; Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_max_links.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_max_links.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_max_links.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -3,6 +3,7 @@ --SKIPIF-- <?php require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); ?> --INI-- mysql.max_links=2 Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_sql_safe_mode.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_sql_safe_mode.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_sql_safe_mode.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -3,6 +3,7 @@ --SKIPIF-- <?php require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); $link = @mysql_connect("", "", "", true); if ($link) die("skip Test cannot be run if annonymous connections are allowed"); Modified: php/php-src/trunk/ext/mysql/tests/001.phpt =================================================================== --- php/php-src/trunk/ext/mysql/tests/001.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/trunk/ext/mysql/tests/001.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -1,7 +1,10 @@ --TEST-- mysql connect --SKIPIF-- -<?php include 'skipif.inc'; ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php require_once('connect.inc'); Modified: php/php-src/trunk/ext/mysql/tests/mysql_connect.phpt =================================================================== --- php/php-src/trunk/ext/mysql/tests/mysql_connect.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/trunk/ext/mysql/tests/mysql_connect.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -1,7 +1,10 @@ --TEST-- mysql_connect() --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include_once "connect.inc"; Modified: php/php-src/trunk/ext/mysql/tests/mysql_max_links.phpt =================================================================== --- php/php-src/trunk/ext/mysql/tests/mysql_max_links.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/trunk/ext/mysql/tests/mysql_max_links.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -3,6 +3,7 @@ --SKIPIF-- <?php require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); ?> --INI-- mysql.max_links=2 Modified: php/php-src/trunk/ext/mysql/tests/mysql_sql_safe_mode.phpt =================================================================== --- php/php-src/trunk/ext/mysql/tests/mysql_sql_safe_mode.phpt 2011-09-08 11:24:33 UTC (rev 316412) +++ php/php-src/trunk/ext/mysql/tests/mysql_sql_safe_mode.phpt 2011-09-08 11:30:58 UTC (rev 316413) @@ -3,6 +3,7 @@ --SKIPIF-- <?php require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); $link = @mysql_connect("", "", "", true); if ($link) die("skip Test cannot be run if annonymous connections are allowed");
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php