summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2011-08-31 22:38:20 +0000
committerMatteo Beccati <mbeccati@php.net>2011-08-31 22:38:20 +0000
commit03ef913497dd34478f039adb9b93c3a213d0a028 (patch)
tree935277029f5367feb805320dbbeac95f1f5e6260
parenta3a5b2197ce4f428200cdb7d5f5d334b44e58ffb (diff)
downloadphp-git-03ef913497dd34478f039adb9b93c3a213d0a028.tar.gz
Fixed test. Apparently it was already fixed on PHP_5_3 98% of the cases and
the fix wasn't ported to trunk/PHP_5_4. However the very same test was failing on my FreeBSD 6.2 box, that appears to also decode the "ks_c_5601-1987" parts, so I've made the test more generic.
-rw-r--r--ext/iconv/tests/bug52941.phpt14
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/iconv/tests/bug52941.phpt b/ext/iconv/tests/bug52941.phpt
index 31aabd5e46..b336d40c4b 100644
--- a/ext/iconv/tests/bug52941.phpt
+++ b/ext/iconv/tests/bug52941.phpt
@@ -28,14 +28,14 @@ var_dump($decoded['X-Foo']);
var_dump($decoded['X-Bar']);
var_dump($decoded['To']);
?>
---EXPECT--
+--EXPECTF--
string(17) "<foo@example.com>"
-string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
+string(%d) "%s"
+string(%d) "%sFoo"
+string(%d) "%sFoo"
string(18) "<test@example.com>"
string(17) "<foo@example.com>"
-string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
+string(%d) "%s"
+string(%d) "%sFoo"
+string(%d) "%sFoo"
string(18) "<test@example.com>"