PHP mysqlnd svn commit: r1094 - trunk/tests/ext/mysqli

[uwendel]

Author: uwendel
Date: 2007-10-12 11:46:34 +0200 (Fri, 12 Oct 2007)
New Revision: 1094

Modified:
   trunk/tests/ext/mysqli/connect.inc
   trunk/tests/ext/mysqli/mysqli_debug.phpt
   trunk/tests/ext/mysqli/mysqli_debug_append.phpt
   trunk/tests/ext/mysqli/mysqli_debug_control_string.phpt
   trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_control_string.phpt
   trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_only.phpt
   trunk/tests/ext/mysqli/skipifconnectfailure.inc
Log:
Upon request of php.net: skip if, we can't connect


Modified: trunk/tests/ext/mysqli/connect.inc
===================================================================
--- trunk/tests/ext/mysqli/connect.inc	2007-10-12 09:00:38 UTC (rev 1093)
+++ trunk/tests/ext/mysqli/connect.inc	2007-10-12 09:46:34 UTC (rev 1094)
@@ -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))) ?

Modified: trunk/tests/ext/mysqli/mysqli_debug.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_debug.phpt	2007-10-12 09:00:38 UTC (rev 1093)
+++ trunk/tests/ext/mysqli/mysqli_debug.phpt	2007-10-12 09:46:34 UTC (rev 1094)
@@ -4,6 +4,7 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
  	die("skip: mysqli_debug() not available");

Modified: trunk/tests/ext/mysqli/mysqli_debug_append.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_debug_append.phpt	2007-10-12 09:00:38 UTC (rev 1093)
+++ trunk/tests/ext/mysqli/mysqli_debug_append.phpt	2007-10-12 09:46:34 UTC (rev 1094)
@@ -4,6 +4,7 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
  	die("skip: mysqli_debug() not available");

Modified: trunk/tests/ext/mysqli/mysqli_debug_control_string.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_debug_control_string.phpt	2007-10-12 09:00:38 UTC (rev
1093)
+++ trunk/tests/ext/mysqli/mysqli_debug_control_string.phpt	2007-10-12 09:46:34 UTC (rev
1094)
@@ -4,6 +4,7 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
  	die("skip: mysqli_debug() not available");

Modified: trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_control_string.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_control_string.phpt	2007-10-12 09:00:38
UTC (rev 1093)
+++ trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_control_string.phpt	2007-10-12 09:46:34
UTC (rev 1094)
@@ -4,6 +4,7 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
  	die("skip: mysqli_debug() not available");

Modified: trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_only.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_only.phpt	2007-10-12 09:00:38 UTC (rev
1093)
+++ trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_only.phpt	2007-10-12 09:46:34 UTC (rev
1094)
@@ -4,6 +4,7 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!function_exists('mysqli_debug'))

Modified: trunk/tests/ext/mysqli/skipifconnectfailure.inc
===================================================================
--- trunk/tests/ext/mysqli/skipifconnectfailure.inc	2007-10-12 09:00:38 UTC (rev 1093)
+++ trunk/tests/ext/mysqli/skipifconnectfailure.inc	2007-10-12 09:46:34 UTC (rev 1094)
@@ -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);