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.

diff --git a/ext/iconv/tests/bug52941.phpt b/ext/iconv/tests/bug52941.phpt
index 753c9ada14375be20e16d1589075ad4ab323ac36..b336d40c4b66e291d56e98fb67db9a7ef8cd5c5b 100644 (file)
--- 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(32) "=?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(32) "=?ks_c_5601-1987?B?UkU6odk=?=Foo"
+string(%d) "%s"
+string(%d) "%sFoo"
+string(%d) "%sFoo"
 string(18) "<test@example.com>"