MFH: fix/add SKIPIF

26 files changed, 42 insertions, 11 deletions

diff --git a/ext/dom/tests/bug34276.phpt b/ext/dom/tests/bug34276.phpt
index e1083364a5..4a63943f7a 100644
--- a/ext/dom/tests/bug34276.phpt
+++ b/ext/dom/tests/bug34276.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug # 34276: setAttributeNS and default namespace
 --SKIPIF--
-<?php require_once('skipif.php'); ?>
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 $xml = <<<HERE
diff --git a/ext/dom/tests/bug35342.phpt b/ext/dom/tests/bug35342.phpt
index 2aab3852b2..c07fd340dc 100644
--- a/ext/dom/tests/bug35342.phpt
+++ b/ext/dom/tests/bug35342.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug # 35342: isset(DOMNodeList->length) returns false
 --SKIPIF--
-<?php require_once('skipif.php'); ?>
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 $dom = new DOMDocument();
diff --git a/ext/dom/tests/dom002.phpt b/ext/dom/tests/dom002.phpt
index 2bc0717d64..3343a1774e 100644
--- a/ext/dom/tests/dom002.phpt
+++ b/ext/dom/tests/dom002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 2: getElementsByTagName() / getElementsByTagNameNS()
 --SKIPIF--
-<?php require_once('skipif.php'); ?>
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 $xml = <<<HERE
diff --git a/ext/iconv/tests/bug37176.phpt b/ext/iconv/tests/bug37176.phpt
index 3923dbd49c..2bcc57c690 100644
--- a/ext/iconv/tests/bug37176.phpt
+++ b/ext/iconv/tests/bug37176.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37176 (iconv_strpos() fails to find a string)
+--SKIPIF--
+<?php include('skipif.inc'); ?>
 --FILE--
 <?php
 var_dump(iconv_strpos('11--','1-',0,'UTF-8'));
diff --git a/ext/mbstring/tests/mb_send_mail01.phpt b/ext/mbstring/tests/mb_send_mail01.phpt
index bc481fbba0..26d2ed2ecd 100644
--- a/ext/mbstring/tests/mb_send_mail01.phpt
+++ b/ext/mbstring/tests/mb_send_mail01.phpt
@@ -2,7 +2,7 @@
 mb_send_mail() test 1 (lang=neutral)
 --SKIPIF--
 <?php
-if (@mb_send_mail() === false || !mb_language("neutral")) {
+if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
 	die("skip mb_send_mail() not available");
 }
 ?>
diff --git a/ext/mbstring/tests/mb_send_mail02.phpt b/ext/mbstring/tests/mb_send_mail02.phpt
index 34dee474bc..6a2dbcfeb0 100644
--- a/ext/mbstring/tests/mb_send_mail02.phpt
+++ b/ext/mbstring/tests/mb_send_mail02.phpt
@@ -2,7 +2,7 @@
 mb_send_mail() test 2 (lang=Japanese)
 --SKIPIF--
 <?php
-if (@mb_send_mail() === false || !mb_language("japanese")) {
+if (!function_exists("mb_send_mail") || !mb_language("japanese")) {
 	die("skip mb_send_mail() not available");
 }
 ?>
diff --git a/ext/mbstring/tests/mb_send_mail03.phpt b/ext/mbstring/tests/mb_send_mail03.phpt
index 3113d8e2ba..4be1f83467 100644
--- a/ext/mbstring/tests/mb_send_mail03.phpt
+++ b/ext/mbstring/tests/mb_send_mail03.phpt
@@ -2,7 +2,7 @@
 mb_send_mail() test 3 (lang=English)
 --SKIPIF--
 <?php
-if (@mb_send_mail() === false || !mb_language("english")) {
+if (!function_exists("mb_send_mail") || !mb_language("english")) {
 	die("skip mb_send_mail() not available");
 }
 ?>
diff --git a/ext/mbstring/tests/mb_send_mail04.phpt b/ext/mbstring/tests/mb_send_mail04.phpt
index 468a1e367b..06aa3a4155 100644
--- a/ext/mbstring/tests/mb_send_mail04.phpt
+++ b/ext/mbstring/tests/mb_send_mail04.phpt
@@ -2,7 +2,7 @@
 mb_send_mail() test 4 (lang=German)
 --SKIPIF--
 <?php
-if (@mb_send_mail() === false || !mb_language("german")) {
+if (!function_exists("mb_send_mail") || !mb_language("german")) {
 	die("skip mb_send_mail() not available");
 }
 ?>
diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt
index 7033424b80..cd3eaf4edc 100644
--- a/ext/mbstring/tests/mb_send_mail05.phpt
+++ b/ext/mbstring/tests/mb_send_mail05.phpt
@@ -2,7 +2,7 @@
 mb_send_mail() test 5 (lang=Simplified Chinese)
 --SKIPIF--
 <?php
-if (@mb_send_mail() === false || !mb_language("Simplified Chinese")) {
+if (!function_exists("mb_send_mail") || !mb_language("Simplified Chinese")) {
 	die("skip mb_send_mail() not available");
 }
 if (!@mb_internal_encoding('GB2312')) {
diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt
index 2e8c151284..08cf24013a 100644
--- a/ext/mbstring/tests/mb_send_mail06.phpt
+++ b/ext/mbstring/tests/mb_send_mail06.phpt
@@ -2,7 +2,7 @@
 mb_send_mail() test 6 (lang=Traditional Chinese)
 --SKIPIF--
 <?php
-if (@mb_send_mail() === false || !mb_language("Traditional Chinese")) {
+if (!function_exists("mb_send_mail") || !mb_language("Traditional Chinese")) {
 	die("skip mb_send_mail() not available");
 }
 if (!@mb_internal_encoding('BIG5')) {
diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt
index 21fdaa597c..ef29652659 100644
--- a/ext/mbstring/tests/mb_send_mail07.phpt
+++ b/ext/mbstring/tests/mb_send_mail07.phpt
@@ -2,7 +2,7 @@
 mb_send_mail() test 7 (lang=Korean)
 --SKIPIF--
 <?php
-if (@mb_send_mail() === false || !mb_language("Korean")) {
+if (!function_exists("mb_send_mail") || !mb_language("Korean")) {
 	die("skip mb_send_mail() not available");
 }
 if (!@mb_internal_encoding('ISO-2022-KR')) {
diff --git a/ext/mcrypt/tests/bug37595.phpt b/ext/mcrypt/tests/bug37595.phpt
index 5241b7f185..3c682129f2 100644
--- a/ext/mcrypt/tests/bug37595.phpt
+++ b/ext/mcrypt/tests/bug37595.phpt
diff --git a/ext/mysql/tests/skipif.inc b/ext/mysql/tests/skipif.inc
index 934420b09a..735be482c7 100755
--- a/ext/mysql/tests/skipif.inc
+++ b/ext/mysql/tests/skipif.inc
@@ -1,8 +1,11 @@
 <?php
 
 include 'connect.inc';
+if (!extension_loaded("mysql")) {
+    die('skip mysql extension not available');
+}
 $link = @mysql_connect($host, $user, $passwd);
 if (!$link) die('skip cannot connect');
 mysql_close($link);
 
-?>
\ No newline at end of file
+?>
diff --git a/ext/simplexml/tests/bug35785.phpt b/ext/simplexml/tests/bug35785.phpt
index de65a19565..096ab7a681 100755
--- a/ext/simplexml/tests/bug35785.phpt
+++ b/ext/simplexml/tests/bug35785.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #35785 (SimpleXML memory read error)
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug36611.phpt b/ext/simplexml/tests/bug36611.phpt
index fdfed0d019..835e926fe5 100644
--- a/ext/simplexml/tests/bug36611.phpt
+++ b/ext/simplexml/tests/bug36611.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #36611 (assignment to SimpleXML object attribute changes argument type to string)
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug37565.phpt b/ext/simplexml/tests/bug37565.phpt
index 85b50eb972..e04f9577f1 100755
--- a/ext/simplexml/tests/bug37565.phpt
+++ b/ext/simplexml/tests/bug37565.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37565 Using reflection::export with simplexml causing a crash 
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/profile12.phpt b/ext/simplexml/tests/profile12.phpt
index 93b65bcaac..51a0d35531 100755
--- a/ext/simplexml/tests/profile12.phpt
+++ b/ext/simplexml/tests/profile12.phpt
@@ -1,5 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing namespaced root and non namespaced children
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/profile13.phpt b/ext/simplexml/tests/profile13.phpt
index f61960b0fa..2ae89e7449 100755
--- a/ext/simplexml/tests/profile13.phpt
+++ b/ext/simplexml/tests/profile13.phpt
@@ -1,5 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing by namespace prefix
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_021.phpt b/ext/spl/tests/array_021.phpt
index f2ae0c87e5..b38cedf0cd 100755
--- a/ext/spl/tests/array_021.phpt
+++ b/ext/spl/tests/array_021.phpt
@@ -1,5 +1,7 @@
 --TEST--
 SPL: ArrayObject::seek() and exceptions
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/array_022.phpt b/ext/spl/tests/array_022.phpt
index d1eafd677c..1067b03bf8 100755
--- a/ext/spl/tests/array_022.phpt
+++ b/ext/spl/tests/array_022.phpt
@@ -1,5 +1,7 @@
 --TEST--
 SPL: ArrayObject/Iterator and reference to self
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 ==ArrayObject===
 <?php
diff --git a/ext/spl/tests/bug36941.phpt b/ext/spl/tests/bug36941.phpt
index 528ba4a462..2ae03b4481 100755
--- a/ext/spl/tests/bug36941.phpt
+++ b/ext/spl/tests/bug36941.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #36941 (ArrayIterator does not clone itself)
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 ===ArrayObject===
 <?php
diff --git a/ext/spl/tests/bug37457.phpt b/ext/spl/tests/bug37457.phpt
index e66fa4d6ed..4395287bcd 100755
--- a/ext/spl/tests/bug37457.phpt
+++ b/ext/spl/tests/bug37457.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37457 (Crash when an exception is thrown in accept() method of FilterIterator)
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/wddx/tests/bug37569.phpt b/ext/wddx/tests/bug37569.phpt
index f741d7b029..cc19bb0943 100755
--- a/ext/wddx/tests/bug37569.phpt
+++ b/ext/wddx/tests/bug37569.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37569 (WDDX incorrectly encodes high-ascii characters)
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
 --FILE--
 <?php
 echo wddx_serialize_value(chr(1))."\n";
diff --git a/ext/wddx/tests/bug37587.phpt b/ext/wddx/tests/bug37587.phpt
index 81e485325c..2b5d5f3994 100755
--- a/ext/wddx/tests/bug37587.phpt
+++ b/ext/wddx/tests/bug37587.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37587 (var without attribute causes segfault)
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlreader/tests/bug36743.phpt b/ext/xmlreader/tests/bug36743.phpt
index 45747d49f1..374941b0c7 100644
--- a/ext/xmlreader/tests/bug36743.phpt
+++ b/ext/xmlreader/tests/bug36743.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #36743 (In a class extending XMLReader array properties are not writable)
+--SKIPIF--
+<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/bug37057.phpt b/ext/xmlrpc/tests/bug37057.phpt
index 0764d8af67..013cc9192c 100644
--- a/ext/xmlrpc/tests/bug37057.phpt
+++ b/ext/xmlrpc/tests/bug37057.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37057 (xmlrpc_decode() may produce arrays with numeric string keys which are unaccessible)
+--SKIPIF--
+<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
 --FILE--
 <?php
 $response='<?xml version="1.0"?>