From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 8 Sep 2011 11:30:58 +0000 (+0000)
Subject: skip these tests if can't connect to mysql
X-Git-Tag: php-5.5.0alpha1~1216
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f40fd8236e2b269296af6eaf79dfaf9239fa1ff9;p=php

skip these tests if can't connect to mysql
---

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");