fix tests.

diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt
index 6a71b4158011462f577d00e159d02ebcadd1eb47..5fc19f45461720407f745294e518886ab4f7e54b 100644 (file)
--- a/ext/mbstring/tests/mb_strlen.phpt
+++ b/ext/mbstring/tests/mb_strlen.phpt
@@ -21,35 +21,35 @@ $ascii  = 'abcdefghijklmnopqrstuvwxyz;]=#0123456789';
 
 // ASCII
 echo "== ASCII ==\n";
-print  strlen($ascii,'ASCII') . "\n";
+print  mb_strlen($ascii,'ASCII') . "\n";
 print  strlen($ascii) . "\n";
 
 // EUC-JP
 echo "== EUC-JP ==\n";
-print  strlen($euc_jp,'EUC-JP') . "\n";
+print  mb_strlen($euc_jp,'EUC-JP') . "\n";
 mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n");
 print  strlen($euc_jp) . "\n";
 
 // SJIS
 echo "== SJIS ==\n";
-$sjis = mb_convert_encoding($euc_jp, 'SJIS');
-print  strlen($sjis,'SJIS') . "\n";
+$sjis = mb_convert_encoding($euc_jp, 'SJIS','EUC-JP');
+print  mb_strlen($sjis,'SJIS') . "\n";
 mb_internal_encoding('SJIS') or print("mb_internal_encoding() failed\n");
 print  strlen($sjis) . "\n";
 
 // JIS
 // Note: either convert_encoding or strlen has problem
 echo "== JIS ==\n";
-$jis = mb_convert_encoding($euc_jp, 'JIS');
-print  strlen($jis,'JIS') . "\n";
+$jis = mb_convert_encoding($euc_jp, 'JIS','EUC-JP');
+print  mb_strlen($jis,'JIS') . "\n";
 mb_internal_encoding('JIS')  or print("mb_internal_encoding() failed\n");
 print  strlen($jis) . "\n"; 
 
 // UTF-8
 // Note: either convert_encoding or strlen has problem
 echo "== UTF-8 ==\n";
-$utf8 = mb_convert_encoding($euc_jp, 'UTF-8');
-print  strlen($utf8,'UTF-8') . "\n";
+$utf8 = mb_convert_encoding($euc_jp, 'UTF-8','EUC-JP');
+print  mb_strlen($utf8,'UTF-8') . "\n";
 mb_internal_encoding('UTF-8')  or print("mb_internal_encoding() failed\n");
 print  strlen($utf8) . "\n";  
 
@@ -66,7 +66,7 @@ $r = strlen($t_obj);
 echo $r."\n";
 // Wrong encoding
 mb_internal_encoding('EUC-JP');
-$r = strlen($euc_jp, 'BAD_NAME');
+$r = mb_strlen($euc_jp, 'BAD_NAME');
 echo $r."\n";
 
 
@@ -76,28 +76,24 @@ echo $r."\n";
 
 --EXPECT--
 == ASCII ==
-ERR: Warning
-
+40
 40
 == EUC-JP ==
-ERR: Warning
-
+43
 72
 == SJIS ==
-ERR: Warning
-
+43
 72
 == JIS ==
-ERR: Warning
-
-121
+43
+90
 == UTF-8 ==
-ERR: Warning
-
-174
+43
+101
 == WRONG PARAMETERS ==
 ERR: Notice
 5
+ERR: Catchable fatal error
 ERR: Notice
 6
 ERR: Warning

diff --git a/ext/mbstring/tests/mb_substr.phpt b/ext/mbstring/tests/mb_substr.phpt
index 893cb64819035d2c1aa4214bd10df54487dffc6d..579e7ffb55c7926d4837a762069336106f280b1b 100644 (file)
--- a/ext/mbstring/tests/mb_substr.phpt
+++ b/ext/mbstring/tests/mb_substr.phpt
@@ -4,6 +4,7 @@ mb_substr()
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
 output_handler=
+mbstring.func_overload=0
 --FILE--
 <?php
 // TODO: Add more encodings