diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2011-09-08 11:30:58 +0000 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2011-09-08 11:30:58 +0000 |
| commit | e1357bdbd1ac26f5c0375cb61cf0f449f70edad6 (patch) | |
| tree | f410102ac1536d29bfd609f09d78aaef2094160c | |
| parent | 26255062b1b565dd6dc6f0af61fc672bc50d62ce (diff) | |
| download | php-git-e1357bdbd1ac26f5c0375cb61cf0f449f70edad6.tar.gz | |
skip these tests if can't connect to mysql
| -rwxr-xr-x | ext/mysql/tests/001.phpt | 5 | ||||
| -rw-r--r-- | ext/mysql/tests/mysql_connect.phpt | 5 | ||||
| -rw-r--r-- | ext/mysql/tests/mysql_max_links.phpt | 1 | ||||
| -rw-r--r-- | ext/mysql/tests/mysql_sql_safe_mode.phpt | 1 |
4 files changed, 10 insertions, 2 deletions
diff --git a/ext/mysql/tests/001.phpt b/ext/mysql/tests/001.phpt index 6f2e284deb..72b6614771 100755 --- a/ext/mysql/tests/001.phpt +++ b/ext/mysql/tests/001.phpt @@ -1,7 +1,10 @@ --TEST-- mysql connect --SKIPIF-- -<?php include 'skipif.inc'; ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php require_once('connect.inc'); diff --git a/ext/mysql/tests/mysql_connect.phpt b/ext/mysql/tests/mysql_connect.phpt index 773264e5ac..7158248040 100644 --- a/ext/mysql/tests/mysql_connect.phpt +++ b/ext/mysql/tests/mysql_connect.phpt @@ -1,7 +1,10 @@ --TEST-- mysql_connect() --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include_once "connect.inc"; diff --git a/ext/mysql/tests/mysql_max_links.phpt b/ext/mysql/tests/mysql_max_links.phpt index fbe3ae0030..52ecd0ac08 100644 --- a/ext/mysql/tests/mysql_max_links.phpt +++ b/ext/mysql/tests/mysql_max_links.phpt @@ -3,6 +3,7 @@ mysql_[p]connect() - max_links/max_persistent --SKIPIF-- <?php require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); ?> --INI-- mysql.max_links=2 diff --git a/ext/mysql/tests/mysql_sql_safe_mode.phpt b/ext/mysql/tests/mysql_sql_safe_mode.phpt index 6c652fb579..4d8ca92e47 100644 --- a/ext/mysql/tests/mysql_sql_safe_mode.phpt +++ b/ext/mysql/tests/mysql_sql_safe_mode.phpt @@ -3,6 +3,7 @@ mysql_[p]connect() - safe_mode --SKIPIF-- <?php require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); $link = @mysql_connect("", "", "", true); if ($link) die("skip Test cannot be run if annonymous connections are allowed"); |