iliaa Tue Oct 25 10:23:22 2005 EDT
Modified files:
/php-src/ext/iconv/tests bug16069.phpt eucjp2iso2022jp.phpt
eucjp2sjis.phpt eucjp2utf8.phpt
iconv001.phpt iconv002.phpt
ob_iconv_handler.phpt
translit-failure.phpt translit-utf8.phpt
Log:
MFB51: Do not run tests if iconv extension is unavailable.
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/bug16069.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/iconv/tests/bug16069.phpt
diff -u php-src/ext/iconv/tests/bug16069.phpt:1.5
php-src/ext/iconv/tests/bug16069.phpt:1.6
--- php-src/ext/iconv/tests/bug16069.phpt:1.5 Sun Aug 7 08:48:31 2005
+++ php-src/ext/iconv/tests/bug16069.phpt Tue Oct 25 10:23:22 2005
@@ -2,7 +2,7 @@
Bug #16069
--SKIPIF--
<?php
-/* include( 'skipif.inc' ); */
+include( 'skipif.inc' );
if (@iconv('CP932', 'EUC-JP//TRANSLIT', "\x87\x6d")=='') {
die("skip CP932 to EUC-JP translit not available\n");
}
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/eucjp2iso2022jp.phpt?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/iconv/tests/eucjp2iso2022jp.phpt
diff -u php-src/ext/iconv/tests/eucjp2iso2022jp.phpt:1.6
php-src/ext/iconv/tests/eucjp2iso2022jp.phpt:1.7
--- php-src/ext/iconv/tests/eucjp2iso2022jp.phpt:1.6 Wed Aug 17 10:01:03 2005
+++ php-src/ext/iconv/tests/eucjp2iso2022jp.phpt Tue Oct 25 10:23:22 2005
@@ -1,7 +1,7 @@
--TEST--
EUC-JP to ISO-2022-JP
--SKIPIF--
-<?php /* include('skipif.inc'); */ ?>
+<?php include('skipif.inc'); ?>
--INI--
error_reporting=2039
unicode.script_encoding=ISO-8859-1
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/eucjp2sjis.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/iconv/tests/eucjp2sjis.phpt
diff -u php-src/ext/iconv/tests/eucjp2sjis.phpt:1.4
php-src/ext/iconv/tests/eucjp2sjis.phpt:1.5
--- php-src/ext/iconv/tests/eucjp2sjis.phpt:1.4 Wed Aug 17 10:01:03 2005
+++ php-src/ext/iconv/tests/eucjp2sjis.phpt Tue Oct 25 10:23:22 2005
@@ -1,7 +1,7 @@
--TEST--
EUC-JP to SJIS
--SKIPIF--
-<?php /* include('skipif.inc'); */ ?>
+<?php include('skipif.inc'); ?>
--INI--
error_reporting=2039
unicode.script_encoding=ISO-8859-1
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/eucjp2utf8.phpt?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/iconv/tests/eucjp2utf8.phpt
diff -u php-src/ext/iconv/tests/eucjp2utf8.phpt:1.8
php-src/ext/iconv/tests/eucjp2utf8.phpt:1.9
--- php-src/ext/iconv/tests/eucjp2utf8.phpt:1.8 Wed Aug 17 10:01:03 2005
+++ php-src/ext/iconv/tests/eucjp2utf8.phpt Tue Oct 25 10:23:22 2005
@@ -1,7 +1,7 @@
--TEST--
EUC-JP to UTF8
--SKIPIF--
-<?php /* include('skipif.inc'); */ ?>
+<?php include('skipif.inc'); ?>
--INI--
error_reporting=2039
unicode.script_encoding=ISO-8859-1
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/iconv001.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/iconv/tests/iconv001.phpt
diff -u php-src/ext/iconv/tests/iconv001.phpt:1.5
php-src/ext/iconv/tests/iconv001.phpt:1.6
--- php-src/ext/iconv/tests/iconv001.phpt:1.5 Wed Aug 17 10:01:03 2005
+++ php-src/ext/iconv/tests/iconv001.phpt Tue Oct 25 10:23:22 2005
@@ -1,7 +1,7 @@
--TEST--
iconv() test 1
--SKIPIF--
-<?php /* include('skipif.inc'); */ ?>
+<?php include('skipif.inc'); ?>
--INI--
unicode.script_encoding=ISO-8859-1
unicode.output_encoding=ISO-8859-1
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/iconv002.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/iconv/tests/iconv002.phpt
diff -u php-src/ext/iconv/tests/iconv002.phpt:1.5
php-src/ext/iconv/tests/iconv002.phpt:1.6
--- php-src/ext/iconv/tests/iconv002.phpt:1.5 Wed Nov 6 11:58:08 2002
+++ php-src/ext/iconv/tests/iconv002.phpt Tue Oct 25 10:23:22 2005
@@ -2,7 +2,7 @@
iconv() test 2 (UCS4BE to ASCII)
--SKIPIF--
<?php
-/* include('skipif.inc'); */
+include('skipif.inc');
if (@iconv("ascii","UCS-4LE", "abcd") == '') {
die("skip conversion to UCS-4LE not supported");
}
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/ob_iconv_handler.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/iconv/tests/ob_iconv_handler.phpt
diff -u php-src/ext/iconv/tests/ob_iconv_handler.phpt:1.5
php-src/ext/iconv/tests/ob_iconv_handler.phpt:1.6
--- php-src/ext/iconv/tests/ob_iconv_handler.phpt:1.5 Wed Aug 17 10:01:03 2005
+++ php-src/ext/iconv/tests/ob_iconv_handler.phpt Tue Oct 25 10:23:22 2005
@@ -1,7 +1,7 @@
--TEST--
ob_iconv_handler()
--SKIPIF--
-<?php /* include('skipif.inc'); */ ?>
+<?php include('skipif.inc'); ?>
--INI--
unicode.script_encoding=ISO-8859-1
unicode.output_encoding=ISO-8859-1
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/translit-failure.phpt?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/iconv/tests/translit-failure.phpt
diff -u php-src/ext/iconv/tests/translit-failure.phpt:1.9
php-src/ext/iconv/tests/translit-failure.phpt:1.10
--- php-src/ext/iconv/tests/translit-failure.phpt:1.9 Sun Jul 6 17:44:44 2003
+++ php-src/ext/iconv/tests/translit-failure.phpt Tue Oct 25 10:23:22 2005
@@ -2,7 +2,7 @@
Translit failure
--SKIPIF--
<?php
-/* include('skipif.inc'); */
+include('skipif.inc');
( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
?>
--INI--
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/translit-utf8.phpt?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/iconv/tests/translit-utf8.phpt
diff -u php-src/ext/iconv/tests/translit-utf8.phpt:1.8
php-src/ext/iconv/tests/translit-utf8.phpt:1.9
--- php-src/ext/iconv/tests/translit-utf8.phpt:1.8 Mon Nov 22 12:43:03 2004
+++ php-src/ext/iconv/tests/translit-utf8.phpt Tue Oct 25 10:23:22 2005
@@ -2,7 +2,7 @@
Translit UTF-8 quotes
--SKIPIF--
<?php
-/* include('skipif.inc'); */
+include('skipif.inc');
( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
?>
--INI--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
