Fix/add SKIPIF

diff --git a/ext/dom/tests/bug34276.phpt b/ext/dom/tests/bug34276.phpt
index e1083364a555a5a7a97b50199a4087eaa2f8556c..4a63943f7a88fed877ec5c30f70b61b7fd8f97d5 100644 (file)
--- 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 2aab3852b22a319ece1188d8e66074fd5f4b77b1..c07fd340dcdd0e5aa5348cd2e46e76ebf776ed7f 100644 (file)
--- 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 bdec0e229e3ca1a312091e4534aed6311072f8b9..92c1a277d4b4ad3d5ce4554a0d18a34c96c5fc6e 100644 (file)
--- 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 3923dbd49c1deea5fa5a0bad9876f9c9be76bc60..2bcc57c6903b7b95733ab8dc7ab4cd3587bf8b09 100644 (file)
--- 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 bc481fbba0784ffc3eacee3d2aa0f7a1d45310bf..26d2ed2ecdfb46efcee28343f7ee1115be56598c 100644 (file)
--- 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 34dee474bc682ca7f4b8694f211cfee7c9a3b278..6a2dbcfeb0c5693a35d58b3b2190d368d81da1cc 100644 (file)
--- 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 3113d8e2bac27d10315b9925284673b18a03346e..4be1f8346745220b636fd0a3d1c233df44baab04 100644 (file)
--- 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 468a1e367bf30852cb160c18e8fc39c86402698f..06aa3a41559ccdca656b5a1b2a1bfaa0e2c953e0 100644 (file)
--- 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 7033424b80e7b1b6ccabbea6b356ebca64d1756a..cd3eaf4edcadd4c00e6ff9e7f828a5af3468b6e7 100644 (file)
--- 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 2e8c1512848402772d774962c7245777cbd2d226..08cf24013a1524aa69fffb129aab28fc2507104e 100644 (file)
--- 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 21fdaa597c5afa7e466a30b990f9bddba735c25e..ef296526598af92a0d645e699d238beef3dc6c18 100644 (file)
--- 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/mysql/tests/skipif.inc b/ext/mysql/tests/skipif.inc
index 934420b09a77a4fed00c6dfe78d038e7c00a355d..735be482c7a0b5d0ccb45741b901d8c07c3e7ae8 100755 (executable)
--- 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 de65a19565b6b670eecc799dcbdc2c25f92a2cc9..096ab7a681d5ddf1bac3472f13a634032bd348fd 100755 (executable)
--- 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 fdfed0d019bb30083c45265af51b5c1a4f01b486..835e926fe5c9c1a0576bf1d4d070c5bca8030441 100644 (file)
--- 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 d33e2c066a7baec5c75b3553d98a16849ea09f2d..811b335ed122b0d177457d69de2d416ca7a2787f 100755 (executable)
--- 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
 function my_error_handler($errno, $errstr, $errfile, $errline) {

diff --git a/ext/simplexml/tests/profile12.phpt b/ext/simplexml/tests/profile12.phpt
index b965a9a47d75518c5e93760abfe9e92ecb01078d..d875ce97f44f75763ae1a648f10f7d02b7d3cb8f 100755 (executable)
--- 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 b7a1caa5bf0e8b1e0a1044d113cc62026011ef2b..957c6ec659bb6b283d701a66cb8032766c6b87ac 100755 (executable)
--- 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 f2ae0c87e5d44769e6253b5010901d6bcb05512a..b38cedf0cd28a053a0effafc9ba73ac2d8e85bb1 100755 (executable)
--- 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 d1eafd677cae84e9535949afa937518944503cf1..1067b03bf83b2c9e9c426e0c14111b1da837dabd 100755 (executable)
--- 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 528ba4a46223bbbe41ef9a8859b368b3d9231cb9..2ae03b4481adf9a7e84cd58c13ad6704b326aa50 100755 (executable)
--- 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 992958bd45e96369bd7a2d45b5d546cdbd614ee4..bd756bb9c9944b1f2110a1ba3b9873d354c86d06 100755 (executable)
--- 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 f741d7b029406712209124722044b1bd74f7bf30..cc19bb0943fc9bab1a631121be6b37f1812d5a65 100755 (executable)
--- 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 81e485325cf241ff7e2848b64adaf30bd646bd9c..2b5d5f3994ad9992a46c2507a32ee281d9f01d5c 100755 (executable)
--- 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 45747d49f10bedc26aa8853a901cc85683769037..374941b0c712f394f5ee05fee861ab9a9925fdb4 100644 (file)
--- 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 0764d8af67b618fe125b770f7f8421a1bf22ba90..013cc9192ce49b2f97203547a8742d12fced2dc9 100644 (file)
--- 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"?>