Author: uwendel
Date: 2007-08-08 15:16:48 +0200 (Wed, 08 Aug 2007)
New Revision: 862
Added:
trunk/tests/ext/mysql/skipifconnectfailure.inc
Modified:
trunk/tests/ext/mysql/mysql_fetch_array.phpt
trunk/tests/ext/mysql/mysql_fetch_assoc.phpt
trunk/tests/ext/mysql/mysql_fetch_field.phpt
trunk/tests/ext/mysql/mysql_fetch_lengths.phpt
trunk/tests/ext/mysql/mysql_fetch_object.phpt
trunk/tests/ext/mysql/mysql_fetch_row.phpt
trunk/tests/ext/mysql/mysql_field_flags.phpt
trunk/tests/ext/mysql/mysql_field_len.phpt
trunk/tests/ext/mysql/mysql_field_name.phpt
trunk/tests/ext/mysql/mysql_field_seek.phpt
trunk/tests/ext/mysql/mysql_field_table.phpt
trunk/tests/ext/mysql/mysql_field_type.phpt
trunk/tests/ext/mysql/mysql_free_result.phpt
trunk/tests/ext/mysql/mysql_get_host_info.phpt
trunk/tests/ext/mysql/mysql_get_proto_info.phpt
trunk/tests/ext/mysql/mysql_get_server_info.phpt
trunk/tests/ext/mysql/mysql_info.phpt
trunk/tests/ext/mysql/mysql_insert_id.phpt
trunk/tests/ext/mysql/mysql_list_dbs.phpt
trunk/tests/ext/mysql/mysql_list_fields.phpt
trunk/tests/ext/mysql/mysql_list_processes.phpt
trunk/tests/ext/mysql/mysql_list_tables.phpt
trunk/tests/ext/mysql/mysql_num_fields.phpt
trunk/tests/ext/mysql/mysql_num_rows.phpt
trunk/tests/ext/mysql/mysql_pconnect.phpt
trunk/tests/ext/mysql/mysql_phpinfo.phpt
trunk/tests/ext/mysql/mysql_ping.phpt
trunk/tests/ext/mysql/mysql_query.phpt
trunk/tests/ext/mysql/mysql_real_escape_string.phpt
trunk/tests/ext/mysql/mysql_result.phpt
trunk/tests/ext/mysql/mysql_select_db.phpt
trunk/tests/ext/mysql/mysql_set_charset.phpt
trunk/tests/ext/mysql/mysql_stat.phpt
trunk/tests/ext/mysql/mysql_tablename.phpt
trunk/tests/ext/mysql/mysql_thread_id.phpt
trunk/tests/ext/mysql/mysql_unbuffered_query.phpt
Log:
Same as for ext/mysqli - new environment variable MYSQL_TEST_SKIP_CONNECT_FAILURE
to skip a test if a MySQL database connection cannot be established.
Modified: trunk/tests/ext/mysql/mysql_fetch_array.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_array.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_fetch_array.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_fetch_assoc.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_assoc.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_fetch_assoc.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_fetch_field.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_field.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_fetch_field.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_fetch_lengths.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_lengths.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_fetch_lengths.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_fetch_object.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_object.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_fetch_object.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_fetch_row.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_fetch_row.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_fetch_row.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_field_flags.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_flags.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_field_flags.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_field_len.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_len.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_field_len.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_field_name.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_name.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_field_name.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_field_seek.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_seek.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_field_seek.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_field_table.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_table.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_field_table.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_field_type.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_type.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_field_type.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_free_result.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_free_result.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_free_result.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_get_host_info.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_get_host_info.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_get_host_info.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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
Modified: trunk/tests/ext/mysql/mysql_get_proto_info.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_get_proto_info.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_get_proto_info.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_get_server_info.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_get_server_info.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_get_server_info.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_info.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_info.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_info.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_insert_id.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_insert_id.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_insert_id.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_list_dbs.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_list_dbs.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_list_dbs.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_list_fields.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_list_fields.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_list_fields.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
@@ -23,7 +26,7 @@
mysql_free_result($res);
mysql_close($link);
-print "done!\n";
+print "done!";
?>
--EXPECTF--
done!
\ No newline at end of file
Modified: trunk/tests/ext/mysql/mysql_list_processes.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_list_processes.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_list_processes.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_list_tables.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_list_tables.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_list_tables.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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
Modified: trunk/tests/ext/mysql/mysql_num_fields.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_num_fields.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_num_fields.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_num_rows.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_num_rows.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_num_rows.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_pconnect.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_pconnect.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_pconnect.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_phpinfo.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_phpinfo.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_phpinfo.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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");
Modified: trunk/tests/ext/mysql/mysql_ping.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_ping.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_ping.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_query.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_query.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_query.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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");
Modified: trunk/tests/ext/mysql/mysql_real_escape_string.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_real_escape_string.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_real_escape_string.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_result.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_result.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_result.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_select_db.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_select_db.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_select_db.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_set_charset.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_set_charset.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_set_charset.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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");
?>
Modified: trunk/tests/ext/mysql/mysql_stat.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_stat.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_stat.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_tablename.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_tablename.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_tablename.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_thread_id.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_thread_id.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_thread_id.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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";
Modified: trunk/tests/ext/mysql/mysql_unbuffered_query.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_unbuffered_query.phpt 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/mysql_unbuffered_query.phpt 2007-08-08 13:16:48 UTC (rev 862)
@@ -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");
Added: trunk/tests/ext/mysql/skipifconnectfailure.inc
===================================================================
--- trunk/tests/ext/mysql/skipifconnectfailure.inc 2007-08-08 11:05:20 UTC (rev 861)
+++ trunk/tests/ext/mysql/skipifconnectfailure.inc 2007-08-08 13:16:48 UTC (rev 862)
@@ -0,0 +1,17 @@
+<?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 (!@mysql_select_db($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
Property changes on: trunk/tests/ext/mysql/skipifconnectfailure.inc
___________________________________________________________________
Name: svn:executable
+ *
| Thread |
|---|
| • PHP mysqlnd svn commit: r862 - trunk/tests/ext/mysql | uwendel | 8 Aug |
