uw Thu Aug 9 11:53:17 2007 UTC
Added files:
/php-src/ext/mysql/tests skipifconnectfailure.inc
Modified files:
/php-src/ext/mysql/tests mysql_fetch_array.phpt
mysql_fetch_assoc.phpt
mysql_fetch_field.phpt
mysql_fetch_lengths.phpt
mysql_fetch_object.phpt
mysql_fetch_row.phpt
mysql_field_flags.phpt
mysql_field_len.phpt mysql_field_name.phpt
mysql_field_seek.phpt
mysql_field_table.phpt
mysql_field_type.phpt
mysql_free_result.phpt
mysql_get_host_info.phpt
mysql_get_proto_info.phpt
mysql_get_server_info.phpt mysql_info.phpt
mysql_insert_id.phpt mysql_list_dbs.phpt
mysql_list_fields.phpt
mysql_list_processes.phpt
mysql_list_tables.phpt
mysql_num_fields.phpt mysql_num_rows.phpt
mysql_pconnect.phpt mysql_phpinfo.phpt
mysql_ping.phpt mysql_query.phpt
mysql_real_escape_string.phpt
mysql_result.phpt mysql_select_db.phpt
mysql_set_charset.phpt mysql_stat.phpt
mysql_tablename.phpt mysql_thread_id.phpt
mysql_unbuffered_query.phpt
Log:
Same as for ext/mysqli tests: addition of a new environment variable
MYSQL_TEST_SKIP_CONNECT_FAILURE which controls how to deal with connection
problems. If MYSQL_TEST_SKIP_CONNECT_FAILURE = false (default) connection
problems will make a test fail. If you set MYSQL_TEST_SKIP_CONNECT_FAILURE
to any value that evaluates to true in PHP, a test which cannot connect to
the database will be skipped.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_array.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_array.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.2
php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.3
--- php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.2 Wed Jul 11 13:36:11 2007
+++ php-src/ext/mysql/tests/mysql_fetch_array.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_array()
--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_fetch_assoc.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_assoc.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.2
php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.3
--- php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.2 Wed Jul 11 13:29:41 2007
+++ php-src/ext/mysql/tests/mysql_fetch_assoc.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_assoc()
--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_fetch_field.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_field.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.3
php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.4
--- php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.3 Mon Jul 23 07:51:37 2007
+++ php-src/ext/mysql/tests/mysql_fetch_field.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_field()
--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_fetch_lengths.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_lengths.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_lengths.phpt:1.2
php-src/ext/mysql/tests/mysql_fetch_lengths.phpt:1.3
--- php-src/ext/mysql/tests/mysql_fetch_lengths.phpt:1.2 Wed Jul 11
13:51:31 2007
+++ php-src/ext/mysql/tests/mysql_fetch_lengths.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_lengths()
--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_fetch_object.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_object.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.2
php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.3
--- php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.2 Wed Jul 11 13:56:37 2007
+++ php-src/ext/mysql/tests/mysql_fetch_object.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_object()
--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_fetch_row.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_row.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.2
php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.3
--- php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.2 Wed Jul 11 14:01:39 2007
+++ php-src/ext/mysql/tests/mysql_fetch_row.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_row()
--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_field_flags.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_flags.phpt
diff -u php-src/ext/mysql/tests/mysql_field_flags.phpt:1.2
php-src/ext/mysql/tests/mysql_field_flags.phpt:1.3
--- php-src/ext/mysql/tests/mysql_field_flags.phpt:1.2 Wed Jul 11 14:11:18 2007
+++ php-src/ext/mysql/tests/mysql_field_flags.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_field_flags()
--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_field_len.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_len.phpt
diff -u php-src/ext/mysql/tests/mysql_field_len.phpt:1.2
php-src/ext/mysql/tests/mysql_field_len.phpt:1.3
--- php-src/ext/mysql/tests/mysql_field_len.phpt:1.2 Wed Jul 11 14:28:22 2007
+++ php-src/ext/mysql/tests/mysql_field_len.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_field_len()
--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_field_name.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_name.phpt
diff -u php-src/ext/mysql/tests/mysql_field_name.phpt:1.2
php-src/ext/mysql/tests/mysql_field_name.phpt:1.3
--- php-src/ext/mysql/tests/mysql_field_name.phpt:1.2 Wed Jul 11 14:36:26 2007
+++ php-src/ext/mysql/tests/mysql_field_name.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_field_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_field_seek.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_seek.phpt
diff -u php-src/ext/mysql/tests/mysql_field_seek.phpt:1.2
php-src/ext/mysql/tests/mysql_field_seek.phpt:1.3
--- php-src/ext/mysql/tests/mysql_field_seek.phpt:1.2 Wed Jul 11 14:36:26 2007
+++ php-src/ext/mysql/tests/mysql_field_seek.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_field_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_field_table.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_table.phpt
diff -u php-src/ext/mysql/tests/mysql_field_table.phpt:1.2
php-src/ext/mysql/tests/mysql_field_table.phpt:1.3
--- php-src/ext/mysql/tests/mysql_field_table.phpt:1.2 Wed Jul 11 14:36:26 2007
+++ php-src/ext/mysql/tests/mysql_field_table.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_field_table()
--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_field_type.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_type.phpt
diff -u php-src/ext/mysql/tests/mysql_field_type.phpt:1.2
php-src/ext/mysql/tests/mysql_field_type.phpt:1.3
--- php-src/ext/mysql/tests/mysql_field_type.phpt:1.2 Wed Jul 11 14:41:54 2007
+++ php-src/ext/mysql/tests/mysql_field_type.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_field_type()
--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_free_result.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_free_result.phpt
diff -u php-src/ext/mysql/tests/mysql_free_result.phpt:1.2
php-src/ext/mysql/tests/mysql_free_result.phpt:1.3
--- php-src/ext/mysql/tests/mysql_free_result.phpt:1.2 Wed Jul 11 14:44:18 2007
+++ php-src/ext/mysql/tests/mysql_free_result.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_free_result()
--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_get_host_info.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_host_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.2
php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.3
--- php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.2 Wed Jul 11
15:07:28 2007
+++ php-src/ext/mysql/tests/mysql_get_host_info.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_get_host_info()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include_once "connect.inc";
@@ -34,4 +37,4 @@
print "done!";
?>
--EXPECTF--
-done!
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_proto_info.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_proto_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_proto_info.phpt:1.2
php-src/ext/mysql/tests/mysql_get_proto_info.phpt:1.3
--- php-src/ext/mysql/tests/mysql_get_proto_info.phpt:1.2 Wed Jul 11
15:07:28 2007
+++ php-src/ext/mysql/tests/mysql_get_proto_info.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_get_proto_info()
--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_get_server_info.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_server_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.2
php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.3
--- php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.2 Wed Jul 11
15:07:28 2007
+++ php-src/ext/mysql/tests/mysql_get_server_info.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_get_server_info()
--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_info.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_info.phpt
diff -u php-src/ext/mysql/tests/mysql_info.phpt:1.2
php-src/ext/mysql/tests/mysql_info.phpt:1.3
--- php-src/ext/mysql/tests/mysql_info.phpt:1.2 Wed Jul 11 15:13:10 2007
+++ php-src/ext/mysql/tests/mysql_info.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_info()
--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_insert_id.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_insert_id.phpt
diff -u php-src/ext/mysql/tests/mysql_insert_id.phpt:1.2
php-src/ext/mysql/tests/mysql_insert_id.phpt:1.3
--- php-src/ext/mysql/tests/mysql_insert_id.phpt:1.2 Wed Jul 11 15:17:47 2007
+++ php-src/ext/mysql/tests/mysql_insert_id.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_insert_id()
--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_list_dbs.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_list_dbs.phpt
diff -u php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.2
php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.3
--- php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.2 Wed Jul 11 15:17:47 2007
+++ php-src/ext/mysql/tests/mysql_list_dbs.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_list_dbs()
--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_list_fields.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_list_fields.phpt
diff -u php-src/ext/mysql/tests/mysql_list_fields.phpt:1.2
php-src/ext/mysql/tests/mysql_list_fields.phpt:1.3
--- php-src/ext/mysql/tests/mysql_list_fields.phpt:1.2 Wed Jul 11 15:47:38 2007
+++ php-src/ext/mysql/tests/mysql_list_fields.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_list_fields()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include_once "connect.inc";
@@ -9,11 +12,10 @@
$tmp = NULL;
$link = NULL;
-if (false !== ($tmp = mysql_list_fields($link, $link)))
+if (false !== ($tmp = @mysql_list_fields($link, $link)))
printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
require('table.inc');
-
if (!$res = mysql_list_fields($db, 'test', $link))
printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
@@ -23,7 +25,7 @@
mysql_free_result($res);
mysql_close($link);
-print "done!\n";
+print "done!";
?>
--EXPECTF--
done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_processes.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_list_processes.phpt
diff -u php-src/ext/mysql/tests/mysql_list_processes.phpt:1.2
php-src/ext/mysql/tests/mysql_list_processes.phpt:1.3
--- php-src/ext/mysql/tests/mysql_list_processes.phpt:1.2 Wed Jul 11
15:49:32 2007
+++ php-src/ext/mysql/tests/mysql_list_processes.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_list_processes()
--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_list_tables.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_list_tables.phpt
diff -u php-src/ext/mysql/tests/mysql_list_tables.phpt:1.1
php-src/ext/mysql/tests/mysql_list_tables.phpt:1.2
--- php-src/ext/mysql/tests/mysql_list_tables.phpt:1.1 Thu Jul 12 14:22:15 2007
+++ php-src/ext/mysql/tests/mysql_list_tables.phpt Thu Aug 9 11:53:17 2007
@@ -1,8 +1,9 @@
--TEST--
mysql_list_tables()
--SKIPIF--
-<?php
-require_once('skipif.inc');
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_num_fields.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_num_fields.phpt
diff -u php-src/ext/mysql/tests/mysql_num_fields.phpt:1.2
php-src/ext/mysql/tests/mysql_num_fields.phpt:1.3
--- php-src/ext/mysql/tests/mysql_num_fields.phpt:1.2 Wed Jul 11 15:51:48 2007
+++ php-src/ext/mysql/tests/mysql_num_fields.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_num_fields()
--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_num_rows.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_num_rows.phpt
diff -u php-src/ext/mysql/tests/mysql_num_rows.phpt:1.2
php-src/ext/mysql/tests/mysql_num_rows.phpt:1.3
--- php-src/ext/mysql/tests/mysql_num_rows.phpt:1.2 Thu Jul 12 10:18:14 2007
+++ php-src/ext/mysql/tests/mysql_num_rows.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_num_rows()
--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_pconnect.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_pconnect.phpt
diff -u php-src/ext/mysql/tests/mysql_pconnect.phpt:1.2
php-src/ext/mysql/tests/mysql_pconnect.phpt:1.3
--- php-src/ext/mysql/tests/mysql_pconnect.phpt:1.2 Thu Jul 12 10:25:40 2007
+++ php-src/ext/mysql/tests/mysql_pconnect.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_pconnect()
--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_phpinfo.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_phpinfo.phpt
diff -u php-src/ext/mysql/tests/mysql_phpinfo.phpt:1.1
php-src/ext/mysql/tests/mysql_phpinfo.phpt:1.2
--- php-src/ext/mysql/tests/mysql_phpinfo.phpt:1.1 Thu Jul 12 14:22:47 2007
+++ php-src/ext/mysql/tests/mysql_phpinfo.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
phpinfo() mysql section
--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_ping.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_ping.phpt
diff -u php-src/ext/mysql/tests/mysql_ping.phpt:1.2
php-src/ext/mysql/tests/mysql_ping.phpt:1.3
--- php-src/ext/mysql/tests/mysql_ping.phpt:1.2 Thu Jul 12 10:30:03 2007
+++ php-src/ext/mysql/tests/mysql_ping.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_ping()
--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_query.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_query.phpt
diff -u php-src/ext/mysql/tests/mysql_query.phpt:1.3
php-src/ext/mysql/tests/mysql_query.phpt:1.4
--- php-src/ext/mysql/tests/mysql_query.phpt:1.3 Thu Jul 12 16:03:10 2007
+++ php-src/ext/mysql/tests/mysql_query.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_query()
--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_real_escape_string.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_real_escape_string.phpt
diff -u php-src/ext/mysql/tests/mysql_real_escape_string.phpt:1.2
php-src/ext/mysql/tests/mysql_real_escape_string.phpt:1.3
--- php-src/ext/mysql/tests/mysql_real_escape_string.phpt:1.2 Thu Jul 12
10:52:23 2007
+++ php-src/ext/mysql/tests/mysql_real_escape_string.phpt Thu Aug 9
11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_real_escape_string()
--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_result.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_result.phpt
diff -u php-src/ext/mysql/tests/mysql_result.phpt:1.2
php-src/ext/mysql/tests/mysql_result.phpt:1.3
--- php-src/ext/mysql/tests/mysql_result.phpt:1.2 Thu Jul 12 16:04:15 2007
+++ php-src/ext/mysql/tests/mysql_result.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_result()
--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_select_db.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_select_db.phpt
diff -u php-src/ext/mysql/tests/mysql_select_db.phpt:1.2
php-src/ext/mysql/tests/mysql_select_db.phpt:1.3
--- php-src/ext/mysql/tests/mysql_select_db.phpt:1.2 Thu Jul 12 13:27:26 2007
+++ php-src/ext/mysql/tests/mysql_select_db.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_select_db()
--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_set_charset.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_set_charset.phpt
diff -u php-src/ext/mysql/tests/mysql_set_charset.phpt:1.1
php-src/ext/mysql/tests/mysql_set_charset.phpt:1.2
--- php-src/ext/mysql/tests/mysql_set_charset.phpt:1.1 Thu Jul 12 14:23:56 2007
+++ php-src/ext/mysql/tests/mysql_set_charset.phpt Thu Aug 9 11:53:17 2007
@@ -3,6 +3,7 @@
--SKIPIF--
<?php
require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysql_set_charset'))
die("skip Function not available");
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_stat.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_stat.phpt
diff -u php-src/ext/mysql/tests/mysql_stat.phpt:1.3
php-src/ext/mysql/tests/mysql_stat.phpt:1.4
--- php-src/ext/mysql/tests/mysql_stat.phpt:1.3 Mon Jul 23 07:51:37 2007
+++ php-src/ext/mysql/tests/mysql_stat.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_stat()
--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_tablename.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_tablename.phpt
diff -u php-src/ext/mysql/tests/mysql_tablename.phpt:1.3
php-src/ext/mysql/tests/mysql_tablename.phpt:1.4
--- php-src/ext/mysql/tests/mysql_tablename.phpt:1.3 Thu Jul 12 13:58:41 2007
+++ php-src/ext/mysql/tests/mysql_tablename.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_tablename()
--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_thread_id.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_thread_id.phpt
diff -u php-src/ext/mysql/tests/mysql_thread_id.phpt:1.2
php-src/ext/mysql/tests/mysql_thread_id.phpt:1.3
--- php-src/ext/mysql/tests/mysql_thread_id.phpt:1.2 Thu Jul 12 13:44:00 2007
+++ php-src/ext/mysql/tests/mysql_thread_id.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_thread_id()
--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_unbuffered_query.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_unbuffered_query.phpt
diff -u php-src/ext/mysql/tests/mysql_unbuffered_query.phpt:1.2
php-src/ext/mysql/tests/mysql_unbuffered_query.phpt:1.3
--- php-src/ext/mysql/tests/mysql_unbuffered_query.phpt:1.2 Thu Jul 12
13:50:51 2007
+++ php-src/ext/mysql/tests/mysql_unbuffered_query.phpt Thu Aug 9 11:53:17 2007
@@ -1,7 +1,10 @@
--TEST--
mysql_unbuffered_query()
--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/skipifconnectfailure.inc?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/skipifconnectfailure.inc
+++ php-src/ext/mysql/tests/skipifconnectfailure.inc
<?php
$skip_on_connect_failure = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ?
getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") : false;
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);
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
