cvs: php4 /ext/iconv/tests eucjp2utf8.inc eucjp2utf8.phpt translit.phpt

yohgaki Sat Jul 13 20:08:22 2002 EDT Modified files: /php4/ext/iconv/tests eucjp2utf8.inc eucjp2utf8.phpt translit.phpt Log: Fix tests. Moriyoshi Koizumi <readjust@deneb.freemail.ne.jp> Index: php4/ext/iconv/tests/eucjp2utf8.inc diff -u php4/ext/iconv/tests/eucjp2utf8.inc:1.1 php4/ext/iconv/tests/eucjp2utf8.inc:1.2 --- php4/ext/iconv/tests/eucjp2utf8.inc:1.1 Sat Mar 2 02:00:40 2002 +++ php4/ext/iconv/tests/eucjp2utf8.inc Sat Jul 13 20:08:22 2002 @@ -40,7 +40,7 @@ ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text "; -$str = iconv("EUC-JP", "UTF8", $str); +$str = iconv("EUC-JP", "UTF-8", $str); $str = base64_encode($str); echo $str."\n"; Index: php4/ext/iconv/tests/eucjp2utf8.phpt diff -u php4/ext/iconv/tests/eucjp2utf8.phpt:1.3 php4/ext/iconv/tests/eucjp2utf8.phpt:1.4 --- php4/ext/iconv/tests/eucjp2utf8.phpt:1.3 Sat Jul 13 04:08:36 2002 +++ php4/ext/iconv/tests/eucjp2utf8.phpt Sat Jul 13 20:08:22 2002 @@ -1,7 +1,7 @@ --TEST-- EUC-JP to UTF8 --SKIPIF-- -<?php include('skipif.inc'); if (iconv("EUC-JP", "UTF8", '') === FALSE) die("skip\n"); ?> +<?php include('skipif.inc'); if (iconv("EUC-JP", "UTF-8", '') === FALSE) die("skip\n"); /* libiconv(1.8) doesn't know "UTF8" but "UTF-8". */ ?> --POST-- --GET-- --FILE-- Index: php4/ext/iconv/tests/translit.phpt diff -u php4/ext/iconv/tests/translit.phpt:1.2 php4/ext/iconv/tests/translit.phpt:1.3 --- php4/ext/iconv/tests/translit.phpt:1.2 Sat Jul 13 04:08:36 2002 +++ php4/ext/iconv/tests/translit.phpt Sat Jul 13 20:08:22 2002 @@ -1,7 +1,7 @@ --TEST-- ICONV: LIBICONV transliteration (bug #16069) --SKIPIF-- -<?php include('skipif.inc'); if(iconv('CP932', 'EUC-JP//TRANSLIT', '\x87\x6d') === FALSE) die("skip\n"); ?> +<?php include('skipif.inc'); if( iconv('CP932', 'EUC-JP//TRANSLIT', "\x87\x6d") == '' ) die("skip(no libiconv)\n"); ?> --POST-- --GET-- --FILE--