Same as for HEAD: Trying to skip tests if they can't connect to the

DB server. Note the environment variable MYSQL_TEST_SKIP_CONNECT_FAILURE
to control if you want tests that can't connect to fail or to be skipped.

diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc
index 5db701d93ba98efca0fec3b5f5aacfda8b11e9d3..9bb9836b725a61562c7c08103ba73729caeb91eb 100644 (file)
--- a/ext/mysqli/tests/connect.inc
+++ b/ext/mysqli/tests/connect.inc
@@ -1,7 +1,7 @@
 <?php
        /*
        Default values are "localhost", "root",
-       database "phptest" and empty password.
+       database "stest" and empty password.
        Change the MYSQL_TEST environment values
        if you want to use another configuration
        */
@@ -12,9 +12,10 @@
        $port      = getenv("MYSQL_TEST_PORT")     ? getenv("MYSQL_TEST_PORT") : 3306;
        $user      = getenv("MYSQL_TEST_USER")     ? getenv("MYSQL_TEST_USER") : "root";
        $passwd    = getenv("MYSQL_TEST_PASSWD")   ? getenv("MYSQL_TEST_PASSWD") : "";
-       $db        = getenv("MYSQL_TEST_DB")       ? getenv("MYSQL_TEST_DB") : "phptest";
+       $db        = getenv("MYSQL_TEST_DB")       ? getenv("MYSQL_TEST_DB") : "test";
        $engine    = getenv("MYSQL_TEST_ENGINE")   ? getenv("MYSQL_TEST_ENGINE") : "MyISAM";
        $socket    = getenv("MYSQL_TEST_SOCKET")   ? getenv("MYSQL_TEST_SOCKET") : null;
+       $skip_on_connect_failure  = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ? getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") : true;
 
        /* Development setting: test experimal features and/or feature requests that never worked before? */
        $TEST_EXPERIMENTAL = (in_array(getenv("MYSQL_TEST_EXPERIMENTAL"), array(0, 1))) ?

diff --git a/ext/mysqli/tests/mysqli_debug.phpt b/ext/mysqli/tests/mysqli_debug.phpt
index 6db6a45e44861effc36f2b65c896c72e15b7bff1..38e38d14d35cf8d6b9118e06746e76974b5ff3cd 100644 (file)
--- a/ext/mysqli/tests/mysqli_debug.phpt
+++ b/ext/mysqli/tests/mysqli_debug.phpt
@@ -4,6 +4,7 @@ mysqli_debug()
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
        die("skip: mysqli_debug() not available");

diff --git a/ext/mysqli/tests/mysqli_debug_append.phpt b/ext/mysqli/tests/mysqli_debug_append.phpt
index 90f6d6faac781059f1a2f70d33bb3fceaadaae8a..7b67d527d6ac85edacbe6c0cbfc25b576c95ea6d 100644 (file)
--- a/ext/mysqli/tests/mysqli_debug_append.phpt
+++ b/ext/mysqli/tests/mysqli_debug_append.phpt
@@ -4,6 +4,7 @@ mysqli_debug() - append to trace file
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
        die("skip: mysqli_debug() not available");

diff --git a/ext/mysqli/tests/mysqli_debug_control_string.phpt b/ext/mysqli/tests/mysqli_debug_control_string.phpt
index 4b869dc14f650295401a8e38f6fa8162eb55cc97..5df3c6068ee82691990e75fc02a3a7ab303d0038 100644 (file)
--- a/ext/mysqli/tests/mysqli_debug_control_string.phpt
+++ b/ext/mysqli/tests/mysqli_debug_control_string.phpt
@@ -4,6 +4,7 @@ mysqli_debug() - invalid debug control strings
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
        die("skip: mysqli_debug() not available");

diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
index 06feebf6a1fa969045c951d589921b38ac83b9c3..87047a96d4e122b76de68eb77bf5955c500c67c5 100644 (file)
--- a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
+++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
@@ -4,6 +4,7 @@ mysqli_debug() - all control string options supported by both mysqlnd and libmys
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
        die("skip: mysqli_debug() not available");

diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
index b8066bea1879338e61e04d5b4adfd02bfbc56bff..1fd5b6a6cb093ab97c9dbfadb02c988c4995aebb 100644 (file)
--- a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
+++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
@@ -4,6 +4,7 @@ mysqli_debug() - mysqlnd only control strings
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!function_exists('mysqli_debug'))

diff --git a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
index ea49205611314decc55d70935140850135076116..95831baa5d76e2159f1735e5091d4d6634446550 100644 (file)
--- a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
@@ -7,6 +7,7 @@ if (ini_get('unicode.semantics'))
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {

diff --git a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
index ef9c3f065e439c453492ae1e5dcb2b0b1670da13..1ac5a67c33bb9365123d684d460e2bc8da7cc9b3 100644 (file)
--- a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
@@ -7,6 +7,7 @@ if (ini_get('unicode.semantics'))
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {

diff --git a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
index a15a51cd806ec45ca6508bb31f2b2969f0b34bc7..c6fc799f7e7fda17ed57aa97a153f2122c7b3f8e 100644 (file)
--- a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
@@ -7,6 +7,7 @@ if (ini_get('unicode.semantics'))
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {

diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
index 016115fc6826f7334f207de232edae19a58ee4e2..39c29344826511cb98bea1408142635b5b2bb9df 100644 (file)
--- a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
@@ -7,6 +7,7 @@ if (ini_get('unicode.semantics'))
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {

diff --git a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
index 7655ecd1e326cbd2ffe2fb4224502e0ee8c0f20f..1b2eaf3a708bf55015d06755ad3a85854865c24e 100644 (file)
--- a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
@@ -7,6 +7,7 @@ if (ini_get('unicode.semantics'))
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {

diff --git a/ext/mysqli/tests/skipifconnectfailure.inc b/ext/mysqli/tests/skipifconnectfailure.inc
index f2b193d3788e056537a3c808dfa1beb2204a07d1..68a62afe56298f9c07fd749dde9ac41f0b638e11 100755 (executable)
--- a/ext/mysqli/tests/skipifconnectfailure.inc
+++ b/ext/mysqli/tests/skipifconnectfailure.inc
@@ -1,5 +1,5 @@
 <?php
-$skip_on_connect_failure  = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ? getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") : false;
+require_once('connect.inc');
 if ($skip_on_connect_failure) {
        include_once('connect.inc');
        $link = @mysqli_connect($host, $user, $passwd, $db, $port, $socket);