Divided the overload test into two so as to handle the case mbregex is

not enabled

diff --git a/ext/mbstring/tests/overload01.phpt b/ext/mbstring/tests/overload01.phpt
new file mode 100644 (file)
index 0000000..b0990e8
--- /dev/null
+++ b/ext/mbstring/tests/overload01.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Function overloading test 1
+--SKIPIF--
+<?php 
+       extension_loaded('mbstring') or die('skip mbstring not available'); 
+       if (!function_exists("mail")) {
+               die('skip mail() function is not available.');
+       }
+?>
+--INI--
+output_handler=
+mbstring.func_overload=7
+mbstring.internal_encoding=EUC-JP
+--FILE--
+<?php
+echo mb_internal_encoding()."\n";
+
+$ngchars = array('ǽ','ɽ','»½','¥½');
+$str = '¸µÏ½ÍÜ»½Ðò¼Òº¾µ½É½¸½Ç½ÎÏɽ¼¨±½ÌÈÄä˽ÎÏŽÉÕ¹½Ê¸·½»ÒͽÃÎñ½Æ¬¥½¥Õ¥¡¡¼';
+var_dump(strlen($str));
+var_dump(mb_strlen($str));
+--EXPECT--
+EUC-JP
+int(33)
+int(33)

diff --git a/ext/mbstring/tests/overload.phpt b/ext/mbstring/tests/overload02.phpt
similarity index 85%
rename from ext/mbstring/tests/overload.phpt
rename to ext/mbstring/tests/overload02.phpt
index ee745f58fe52f6a9872b3cf4444a436762956077..9b5cecdc4024258960377f688f247323a3c88201 100644 (file)
--- a/ext/mbstring/tests/overload.phpt
+++ b/ext/mbstring/tests/overload02.phpt
@@ -1,11 +1,14 @@
 --TEST--
-Function overloading test (said to be harmful)
+Function overloading test 2 
 --SKIPIF--
 <?php 
        extension_loaded('mbstring') or die('skip mbstring not available'); 
        if (!function_exists("mail")) {
                die('skip mail() function is not available.');
        }
+       if (!function_exists("mb_ereg_replace")) {
+               die('skip mb_ereg_replace() function is not available.');
+       }
 ?>
 --INI--
 output_handler=
@@ -17,9 +20,6 @@ echo mb_internal_encoding()."\n";
 
 $ngchars = array('ǽ','ɽ','»½','¥½');
 $str = '¸µÏ½ÍÜ»½Ðò¼Òº¾µ½É½¸½Ç½ÎÏɽ¼¨±½ÌÈÄä˽ÎÏŽÉÕ¹½Ê¸·½»ÒͽÃÎñ½Æ¬¥½¥Õ¥¡¡¼';
-var_dump(strlen($str));
-var_dump(mb_strlen($str));
-
 $converted_str = mb_convert_encoding($str, 'Shift_JIS');
 mb_regex_encoding('Shift_JIS');
 foreach($ngchars as $c) {
@@ -30,8 +30,6 @@ foreach($ngchars as $c) {
 ?>
 --EXPECT--
 EUC-JP
-int(33)
-int(33)
 int(10)
 int(8)
 int(3)