From: foobar <sniper@php.net>
Date: Tue, 1 Nov 2005 14:36:37 +0000 (+0000)
Subject: MFH: Hiding bugs is not purpose of the regression tests.
X-Git-Tag: php-5.1.0RC5~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f803888510e225bf16eb9b8dc1627da8b5addf73;p=php

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

diff --git a/ext/iconv/tests/skipif.inc b/ext/iconv/tests/skipif.inc
index 631e6f8bf3..70d0067446 100644
--- 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 8427f4c4d1..22f405ae53 100644
--- 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