uw Fri Oct 12 12:32:39 2007 UTC
Modified files:
/php-src/ext/mysql/tests connect.inc skipifconnectfailure.inc
mysql_trace_mode.phpt
mysql_max_persistent.phpt mysql_error.phpt
mysql_errno.phpt mysql_db_query.phpt
mysql_db_name.phpt mysql_data_seek.phpt
mysql_constants.phpt mysql_close.phpt
mysql_client_encoding.phpt
mysql_affected_rows.phpt 003.phpt 002.phpt
Log:
Same as for PHP_5_3: 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.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/connect.inc?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/connect.inc
diff -u php-src/ext/mysql/tests/connect.inc:1.3
php-src/ext/mysql/tests/connect.inc:1.4
--- php-src/ext/mysql/tests/connect.inc:1.3 Mon Jul 23 07:51:37 2007
+++ php-src/ext/mysql/tests/connect.inc Fri Oct 12 12:32:39 2007
@@ -43,7 +43,7 @@
}
/*
-Default values are "localhost", "root", database "phptest" and empty password.
+Default values are "localhost", "root", database "test" and empty password.
Change the MYSQL_TEST_* environment values if you want to use another
configuration.
*/
@@ -54,6 +54,7 @@
$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))) ?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/skipifconnectfailure.inc?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/skipifconnectfailure.inc
diff -u php-src/ext/mysql/tests/skipifconnectfailure.inc:1.1
php-src/ext/mysql/tests/skipifconnectfailure.inc:1.2
--- php-src/ext/mysql/tests/skipifconnectfailure.inc:1.1 Thu Aug 9
11:53:17 2007
+++ php-src/ext/mysql/tests/skipifconnectfailure.inc Fri Oct 12 12:32:39 2007
@@ -1,17 +1,17 @@
<?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) {
if ($socket)
$myhost = sprintf("%s:%s", $host, $socket);
else if ($port)
$myhost = sprintf("%s:%s", $host, $port);
-
+
if (!$link = @mysql_connect($myhost, $user, $passwd, true))
die(sprintf("skip Can't connect to MySQL Server - [%d] %s",
mysql_errno(), mysql_error()));
if ([EMAIL PROTECTED]($db, $link))
die(sprintf("skip Can't connect to MySQL Server - [%d] %s",
mysql_errno(), mysql_error()));
-
+
mysql_close($link);
}
?>
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_trace_mode.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_trace_mode.phpt
diff -u php-src/ext/mysql/tests/mysql_trace_mode.phpt:1.2
php-src/ext/mysql/tests/mysql_trace_mode.phpt:1.3
--- php-src/ext/mysql/tests/mysql_trace_mode.phpt:1.2 Wed Oct 10 10:55:52 2007
+++ php-src/ext/mysql/tests/mysql_trace_mode.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql.trace_mode=1
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--INI--
mysql.trace_mode=1
error_reporting=E_ALL | E_NOTICE | E_STRICT
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_max_persistent.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_max_persistent.phpt
diff -u php-src/ext/mysql/tests/mysql_max_persistent.phpt:1.2
php-src/ext/mysql/tests/mysql_max_persistent.phpt:1.3
--- php-src/ext/mysql/tests/mysql_max_persistent.phpt:1.2 Wed Oct 10
10:55:52 2007
+++ php-src/ext/mysql/tests/mysql_max_persistent.phpt Fri Oct 12 12:32:39 2007
@@ -3,6 +3,7 @@
--SKIPIF--
<?php
require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
require_once('connect.inc');
$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_error.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_error.phpt
diff -u php-src/ext/mysql/tests/mysql_error.phpt:1.2
php-src/ext/mysql/tests/mysql_error.phpt:1.3
--- php-src/ext/mysql/tests/mysql_error.phpt:1.2 Wed Jul 11 12:57:57 2007
+++ php-src/ext/mysql/tests/mysql_error.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_error()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_errno.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_errno.phpt
diff -u php-src/ext/mysql/tests/mysql_errno.phpt:1.3
php-src/ext/mysql/tests/mysql_errno.phpt:1.4
--- php-src/ext/mysql/tests/mysql_errno.phpt:1.3 Thu Jul 12 13:57:36 2007
+++ php-src/ext/mysql/tests/mysql_errno.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_errno()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_query.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_query.phpt
diff -u php-src/ext/mysql/tests/mysql_db_query.phpt:1.2
php-src/ext/mysql/tests/mysql_db_query.phpt:1.3
--- php-src/ext/mysql/tests/mysql_db_query.phpt:1.2 Wed Jul 11 12:50:34 2007
+++ php-src/ext/mysql/tests/mysql_db_query.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_db_query()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_name.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_name.phpt
diff -u php-src/ext/mysql/tests/mysql_db_name.phpt:1.2
php-src/ext/mysql/tests/mysql_db_name.phpt:1.3
--- php-src/ext/mysql/tests/mysql_db_name.phpt:1.2 Wed Jul 11 12:47:23 2007
+++ php-src/ext/mysql/tests/mysql_db_name.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_db_name()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_data_seek.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_data_seek.phpt
diff -u php-src/ext/mysql/tests/mysql_data_seek.phpt:1.2
php-src/ext/mysql/tests/mysql_data_seek.phpt:1.3
--- php-src/ext/mysql/tests/mysql_data_seek.phpt:1.2 Wed Jul 11 12:28:46 2007
+++ php-src/ext/mysql/tests/mysql_data_seek.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_data_seek()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_constants.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_constants.phpt
diff -u php-src/ext/mysql/tests/mysql_constants.phpt:1.2
php-src/ext/mysql/tests/mysql_constants.phpt:1.3
--- php-src/ext/mysql/tests/mysql_constants.phpt:1.2 Thu Jul 12 14:24:53 2007
+++ php-src/ext/mysql/tests/mysql_constants.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
Constants exported by ext/mysql
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
require("connect.inc");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_close.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_close.phpt
diff -u php-src/ext/mysql/tests/mysql_close.phpt:1.2
php-src/ext/mysql/tests/mysql_close.phpt:1.3
--- php-src/ext/mysql/tests/mysql_close.phpt:1.2 Wed Jul 11 11:57:45 2007
+++ php-src/ext/mysql/tests/mysql_close.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_close()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_client_encoding.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_client_encoding.phpt
diff -u php-src/ext/mysql/tests/mysql_client_encoding.phpt:1.2
php-src/ext/mysql/tests/mysql_client_encoding.phpt:1.3
--- php-src/ext/mysql/tests/mysql_client_encoding.phpt:1.2 Wed Jul 11
11:57:45 2007
+++ php-src/ext/mysql/tests/mysql_client_encoding.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_client_encoding()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include_once "connect.inc";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_affected_rows.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_affected_rows.phpt
diff -u php-src/ext/mysql/tests/mysql_affected_rows.phpt:1.3
php-src/ext/mysql/tests/mysql_affected_rows.phpt:1.4
--- php-src/ext/mysql/tests/mysql_affected_rows.phpt:1.3 Wed Jul 11
11:57:45 2007
+++ php-src/ext/mysql/tests/mysql_affected_rows.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_affected_rows()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include_once("connect.inc");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/003.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/003.phpt
diff -u php-src/ext/mysql/tests/003.phpt:1.2
php-src/ext/mysql/tests/003.phpt:1.3
--- php-src/ext/mysql/tests/003.phpt:1.2 Wed Jul 11 11:12:10 2007
+++ php-src/ext/mysql/tests/003.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_object
--SKIPIF--
-<?php include 'skipif.inc'; ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include_once('connect.inc');
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/002.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/002.phpt
diff -u php-src/ext/mysql/tests/002.phpt:1.2
php-src/ext/mysql/tests/002.phpt:1.3
--- php-src/ext/mysql/tests/002.phpt:1.2 Wed Jul 11 11:12:10 2007
+++ php-src/ext/mysql/tests/002.phpt Fri Oct 12 12:32:39 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_array
--SKIPIF--
-<?php include 'skipif.inc'; ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
require_once('connect.inc');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
