summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/iconv/tests/eucjp2utf8.inc2
-rw-r--r--ext/iconv/tests/eucjp2utf8.phpt2
-rw-r--r--ext/iconv/tests/translit.phpt2
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/iconv/tests/eucjp2utf8.inc b/ext/iconv/tests/eucjp2utf8.inc
index 5971491f88..7fd64b410a 100644
--- 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 88b05f92a6..69a659f3f0 100644
--- 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 70f375c18f..2d16d80ba0 100644
--- 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--