Skip to content

Commit d0ce868

Browse files
committed
iconv: fix test with duplicate SKIPIF from merge up
I didn't get a merge conflict here so assumed it was fine.
1 parent 8d1d4e3 commit d0ce868

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

ext/iconv/tests/iconv_mime_encode.phpt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
iconv_mime_encode()
33
--EXTENSIONS--
44
iconv
5+
--INI--
6+
iconv.internal_charset=iso-8859-1
57
--SKIPIF--
68
<?php
79
// ISO-2022-JP is a stateful encoding, so the right answer is not
@@ -11,11 +13,6 @@ iconv
1113
if (ICONV_IMPL == "unknown") {
1214
die("skip byte-comparison of stateful encoding with unknown iconv");
1315
}
14-
?>
15-
--INI--
16-
iconv.internal_charset=iso-8859-1
17-
--SKIPIF--
18-
<?php
1916
if (PHP_OS_FAMILY === 'Solaris') {
2017
die("skip Solaris native iconv does not support MIME encoding");
2118
}
@@ -36,7 +33,7 @@ $preference = array(
3633
for ($line_len= 0; $line_len < 80; ++$line_len) {
3734
print "-------- line length=$line_len\n";
3835
$preference["line-length"] = $line_len;
39-
$result = iconv_mime_encode("From", "サンプル文字列サンプル文字列日本語テキスト", $preference);
36+
$result = iconv_mime_encode("From", "����ץ�ʸ���󥵥�ץ�ʸ�������ܸ�ƥ�����", $preference);
4037
var_dump($result);
4138
if ($result !== false) {
4239
$max = max(array_map("strlen", explode("\n", $result)));

0 commit comments

Comments
 (0)