cvs: php-src(PHP_5_1) /ext/iconv/tests skipif.inc /ext/xml/tests bug32001.phpt

From: Date: Tue, 01 Nov 2005 14:36:37 +0000
Subject: cvs: php-src(PHP_5_1) /ext/iconv/tests skipif.inc /ext/xml/tests bug32001.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-34940@lists.php.net to get a copy of this message
sniper Tue Nov 1 09:36:37 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/iconv/tests skipif.inc /php-src/ext/xml/tests bug32001.phpt Log: MFH: Hiding bugs is not purpose of the regression tests. http://cvs.php.net/diff.php/php-src/ext/iconv/tests/skipif.inc?r1=1.3.18.1&r2=1.3.18.2&ty=u Index: php-src/ext/iconv/tests/skipif.inc diff -u php-src/ext/iconv/tests/skipif.inc:1.3.18.1 php-src/ext/iconv/tests/skipif.inc:1.3.18.2 --- php-src/ext/iconv/tests/skipif.inc:1.3.18.1 Sun Oct 30 13:07:46 2005 +++ php-src/ext/iconv/tests/skipif.inc Tue Nov 1 09:36:37 2005 @@ -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 +?> http://cvs.php.net/diff.php/php-src/ext/xml/tests/bug32001.phpt?r1=1.6.2.1&r2=1.6.2.2&ty=u Index: php-src/ext/xml/tests/bug32001.phpt diff -u php-src/ext/xml/tests/bug32001.phpt:1.6.2.1 php-src/ext/xml/tests/bug32001.phpt:1.6.2.2 --- php-src/ext/xml/tests/bug32001.phpt:1.6.2.1 Sun Oct 30 13:07:47 2005 +++ php-src/ext/xml/tests/bug32001.phpt Tue Nov 1 09:36:37 2005 @@ -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

« previous php.cvs (#34940) next »