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

From: Date: Tue, 01 Nov 2005 14:36:13 +0000
Subject: cvs: php-src /ext/iconv/tests skipif.inc /ext/xml/tests bug32001.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-34939@lists.php.net to get a copy of this message
sniper Tue Nov 1 09:36:13 2005 EDT Modified files: /php-src/ext/iconv/tests skipif.inc /php-src/ext/xml/tests bug32001.phpt Log: - Hiding bugs is not the purpose of the regression tests. http://cvs.php.net/diff.php/php-src/ext/iconv/tests/skipif.inc?r1=1.4&r2=1.5&ty=u Index: php-src/ext/iconv/tests/skipif.inc diff -u php-src/ext/iconv/tests/skipif.inc:1.4 php-src/ext/iconv/tests/skipif.inc:1.5 --- php-src/ext/iconv/tests/skipif.inc:1.4 Sun Oct 30 13:08:17 2005 +++ php-src/ext/iconv/tests/skipif.inc Tue Nov 1 09:36:13 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.7&r2=1.8&ty=u Index: php-src/ext/xml/tests/bug32001.phpt diff -u php-src/ext/xml/tests/bug32001.phpt:1.7 php-src/ext/xml/tests/bug32001.phpt:1.8 --- php-src/ext/xml/tests/bug32001.phpt:1.7 Sun Oct 30 13:08:17 2005 +++ php-src/ext/xml/tests/bug32001.phpt Tue Nov 1 09:36:13 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 (#34939) next »