MFB51: Improve iconv skip conditions

diff --git a/ext/iconv/tests/skipif.inc b/ext/iconv/tests/skipif.inc
index 6f7bbf2b86523bc1e0b45246cf279fbb85997aef..631e6f8bf387c66e03046faf9fef409e13004aa8 100644 (file)
--- a/ext/iconv/tests/skipif.inc
+++ b/ext/iconv/tests/skipif.inc
@@ -6,7 +6,7 @@
 //  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
 //  @dl("iconv$dlext");
 //}
-if (!extension_loaded("iconv")) {
-    die("skip iconv extension not available\n");
+if (!function_exists("iconv")) {
+    die("skip iconv function not available\n");
 }
 ?>
\ No newline at end of file

diff --git a/ext/xml/tests/bug32001.phpt b/ext/xml/tests/bug32001.phpt
index 6b7320d06b5375d46f77b49684d6f184fda31ec3..8427f4c4d1ee9f761676e06147c6ebc9815b2549 100644 (file)
--- a/ext/xml/tests/bug32001.phpt
+++ b/ext/xml/tests/bug32001.phpt
@@ -2,7 +2,7 @@
 Bug #32001 (xml_parse*() goes into infinite loop when autodetection in effect)
 --SKIPIF--
 <?php
-       if (!extension_loaded('iconv')) print 'skip';
+       if (!function_exists('iconv')) print 'skip';
 ?>
 --FILE--
 <?php