- Fixed tests

diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt
index abe12763eb1063a3969430ba3ce1528dce596ac9..2951f76ff9678dba7f5d3df7a0ef5248a5551409 100644 (file)
--- a/ext/mbstring/tests/mb_split.phpt
+++ b/ext/mbstring/tests/mb_split.phpt
@@ -35,14 +35,32 @@ mbstring.func_overload=0
        }
 ?>
 
---EXPECT--
+--EXPECTF--
 bool(true)
+
+Deprecated: Function split() is deprecated in %s on line %d
 ok
+
+Deprecated: Function split() is deprecated in %s on line %d
 ok
+
+Deprecated: Function split() is deprecated in %s on line %d
 ok
+
+Deprecated: Function split() is deprecated in %s on line %d
 ok
+
+Deprecated: Function split() is deprecated in %s on line %d
 ok
+
+Deprecated: Function split() is deprecated in %s on line %d
 ok
+
+Deprecated: Function split() is deprecated in %s on line %d
 2-2
+
+Deprecated: Function split() is deprecated in %s on line %d
 3-3
+
+Deprecated: Function split() is deprecated in %s on line %d
 4-4

diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt
index 85eefd756c29e4918850b228c55ca5744ab8e48b..1cbfc2ae1f4ae1afe953968c2fb4df46f3dc8a27 100644 (file)
--- a/ext/mbstring/tests/php_gr_jp_10830.phpt
+++ b/ext/mbstring/tests/php_gr_jp_10830.phpt
@@ -13,6 +13,8 @@ var_dump( mb_ereg("^[^><]+$",$a) );
 var_dump( ereg("^[^><]+$",$a) );
 ?>
 
---EXPECT--
+--EXPECTF--
 bool(false)
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 bool(false)

diff --git a/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt b/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt
index a0ab0c847daf5c5d1585e0cc29101898899e6ed9..64fc054aabc4861b98fa6a575a64608d25acb665 100644 (file)
--- a/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt
+++ b/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt
@@ -12,7 +12,8 @@ var_dump(ereg_replace(".*", "b", "a"));
 var_dump(preg_replace("/.*/", "b", "a"));
 var_dump(mb_ereg_replace(".*", "b", "a"));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(2) "bb"
 string(2) "bb"
 string(2) "bb"

diff --git a/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt b/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt
index d81f92f416de78b454708ca70c2852cee62aa8ab..937b2171b5fa2fa17358631c3603e583676b6b0f 100644 (file)
--- a/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt
+++ b/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt
@@ -12,8 +12,12 @@ var_dump(ereg_replace("C?$", "Z", "ABC"));
 var_dump(mb_ereg_replace("C*$", "Z", "ABC"));
 var_dump(ereg_replace("C*$", "Z", "ABC"));
 ?>
---EXPECT--
+--EXPECTF--
 string(4) "ABZZ"
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(4) "ABZZ"
 string(4) "ABZZ"
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(4) "ABZZ"