uw Fri Oct 12 11:51:22 2007 UTC
Modified files:
/php-src/ext/mysqli/tests mysqli_debug.phpt
mysqli_debug_control_string.phpt
mysqli_debug_append.phpt
mysqli_debug_mysqlnd_control_string.phpt
mysqli_debug_mysqlnd_only.phpt
mysqli_real_escape_string_big5.phpt
mysqli_real_escape_string_eucjpms.phpt
mysqli_real_escape_string_euckr.phpt
mysqli_real_escape_string_gb2312.phpt
mysqli_real_escape_string_sjis.phpt
skipifconnectfailure.inc connect.inc
Log:
Trying to make them not fail but skip if they cannot connect to the DB.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_debug.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_debug.phpt
diff -u php-src/ext/mysqli/tests/mysqli_debug.phpt:1.3
php-src/ext/mysqli/tests/mysqli_debug.phpt:1.4
--- php-src/ext/mysqli/tests/mysqli_debug.phpt:1.3 Wed Oct 10 10:43:39 2007
+++ php-src/ext/mysqli/tests/mysqli_debug.phpt Fri Oct 12 11:51:22 2007
@@ -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");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_debug_control_string.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_debug_control_string.phpt
diff -u php-src/ext/mysqli/tests/mysqli_debug_control_string.phpt:1.2
php-src/ext/mysqli/tests/mysqli_debug_control_string.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_debug_control_string.phpt:1.2 Wed Oct
10 10:43:39 2007
+++ php-src/ext/mysqli/tests/mysqli_debug_control_string.phpt Fri Oct 12
11:51:22 2007
@@ -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");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_debug_append.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_debug_append.phpt
diff -u php-src/ext/mysqli/tests/mysqli_debug_append.phpt:1.2
php-src/ext/mysqli/tests/mysqli_debug_append.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_debug_append.phpt:1.2 Wed Oct 10
10:43:39 2007
+++ php-src/ext/mysqli/tests/mysqli_debug_append.phpt Fri Oct 12 11:51:22 2007
@@ -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");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
diff -u php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt:1.2
php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt:1.2
Wed Oct 10 10:43:39 2007
+++ php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt Fri Oct
12 11:51:22 2007
@@ -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");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
diff -u php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt:1.2
php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt:1.2 Wed Oct 10
10:43:39 2007
+++ php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt Fri Oct 12
11:51:22 2007
@@ -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'))
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
diff -u php-src/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt:1.2
php-src/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt:1.2 Wed Oct
10 10:46:06 2007
+++ php-src/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt Fri Oct
12 11:51:22 2007
@@ -7,6 +7,7 @@
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)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
diff -u php-src/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt:1.2
php-src/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt:1.2 Wed Oct
10 10:46:06 2007
+++ php-src/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt Fri Oct
12 11:51:22 2007
@@ -7,6 +7,7 @@
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)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
diff -u php-src/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt:1.2
php-src/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt:1.2 Wed Oct
10 10:46:06 2007
+++ php-src/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt Fri Oct
12 11:51:22 2007
@@ -7,6 +7,7 @@
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)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
diff -u php-src/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt:1.2
php-src/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt:1.2 Wed Oct
10 10:46:06 2007
+++ php-src/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt Fri Oct
12 11:51:22 2007
@@ -7,6 +7,7 @@
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)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
diff -u php-src/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt:1.2
php-src/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt:1.2 Wed Oct
10 10:46:06 2007
+++ php-src/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt Fri Oct
12 11:51:22 2007
@@ -7,6 +7,7 @@
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)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/skipifconnectfailure.inc?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqli/tests/skipifconnectfailure.inc
diff -u php-src/ext/mysqli/tests/skipifconnectfailure.inc:1.1
php-src/ext/mysqli/tests/skipifconnectfailure.inc:1.2
--- php-src/ext/mysqli/tests/skipifconnectfailure.inc:1.1 Thu Aug 9
08:41:11 2007
+++ php-src/ext/mysqli/tests/skipifconnectfailure.inc Fri Oct 12 11:51:22 2007
@@ -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);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/connect.inc?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/mysqli/tests/connect.inc
diff -u php-src/ext/mysqli/tests/connect.inc:1.10
php-src/ext/mysqli/tests/connect.inc:1.11
--- php-src/ext/mysqli/tests/connect.inc:1.10 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/connect.inc Fri Oct 12 11:51:22 2007
@@ -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))) ?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
