- Hiding bugs is not the purpose of the regression tests.

diff --git a/ext/iconv/tests/skipif.inc b/ext/iconv/tests/skipif.inc
index 631e6f8bf387c66e03046faf9fef409e13004aa8..70d00674466b14413d830a0b6fe6a224a2b6d5dd 100644 (file)
--- a/ext/iconv/tests/skipif.inc
+++ b/ext/iconv/tests/skipif.inc
@@ -1,12 +1,5 @@
 <?php
-// This script prints "skip" if condition does not meet.
-
-// Do not dl load extension
-//if (!extension_loaded("iconv") && ini_get("enable_dl")) {
-//  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
-//  @dl("iconv$dlext");
-//}
-if (!function_exists("iconv")) {
-    die("skip iconv function not available\n");
+if (!extension_loaded("iconv")) {
+    die("skip iconv extension not available\n");
 }
-?>
\ No newline at end of file
+?>

diff --git a/ext/xml/tests/bug32001.phpt b/ext/xml/tests/bug32001.phpt
index 8427f4c4d1ee9f761676e06147c6ebc9815b2549..22f405ae53855ddd4015a7b6fc8fc03b35822876 100644 (file)
--- a/ext/xml/tests/bug32001.phpt
+++ b/ext/xml/tests/bug32001.phpt
@@ -2,7 +2,9 @@
 Bug #32001 (xml_parse*() goes into infinite loop when autodetection in effect)
 --SKIPIF--
 <?php
-       if (!function_exists('iconv')) print 'skip';
+       if (!extension_loaded('iconv')) {
+               die ("skip iconv extension not available\n");
+       }
 ?>
 --FILE--
 <?php