Fix tests. Moriyoshi Koizumi <readjust@deneb.freemail.ne.jp>

diff --git a/ext/iconv/tests/eucjp2utf8.inc b/ext/iconv/tests/eucjp2utf8.inc
index 5971491f8863cf2a4827ce2e85c18df312d39441..7fd64b410a8ec6af66b06a913b9ae273149c0b03 100644 (file)
--- a/ext/iconv/tests/eucjp2utf8.inc
+++ b/ext/iconv/tests/eucjp2utf8.inc
@@ -40,7 +40,7 @@ $str = "
 ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
 ";
 
-$str = iconv("EUC-JP", "UTF8", $str);
+$str = iconv("EUC-JP", "UTF-8", $str);
 $str = base64_encode($str);
 echo $str."\n";
 

diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 88b05f92a6aefedd95963f5d088788a7fbd0b71c..69a659f3f015d637958817454ba03420801dc7db 100644 (file)
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -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--

diff --git a/ext/iconv/tests/translit.phpt b/ext/iconv/tests/translit.phpt
index 70f375c18f018a90c970812a502afeb2dcf9257b..2d16d80ba0fe4b249bfbc9469d996bbb62fa08f9 100644 (file)
--- a/ext/iconv/tests/translit.phpt
+++ b/ext/iconv/tests/translit.phpt
@@ -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--