fixed failed tests (backport from PHP_5_4/trunk).

diff --git a/Zend/tests/multibyte/multibyte_encoding_003.phpt b/Zend/tests/multibyte/multibyte_encoding_003.phpt
index 19b29f209bd888bbb64cf8a18188ef3d6c21b0f5..badfcc5a63054ac3762634d88a50f860395e0d43 100755 (executable)
Binary files a/Zend/tests/multibyte/multibyte_encoding_003.phpt and b/Zend/tests/multibyte/multibyte_encoding_003.phpt differ

diff --git a/ext/mbstring/tests/mb_ereg_search_pos.phpt b/ext/mbstring/tests/mb_ereg_search_pos.phpt
index fcd98e16c684893542c76426cd489b6f3301f935..08fcd7f87b636d4144de7b160db87df9f85c3bc1 100644 (file)
--- a/ext/mbstring/tests/mb_ereg_search_pos.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_pos.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('mbstring')) die('skip mbstring not enabled');
 ?>
 --FILE--
 <?php
-
+mb_regex_encoding('iso-8859-1');
 $test_str = 'Iñtërnâtiônàlizætiøn';
 
 if(mb_ereg_search_init($test_str))

diff --git a/ext/mbstring/tests/zend_multibyte-10.phpt b/ext/mbstring/tests/zend_multibyte-10.phpt
index c3543c937aababa68219df0b53a4fdb24f4624d7..89c7c1c26c919ef97f36abd055602cc49d0d21e0 100644 (file)
--- a/ext/mbstring/tests/zend_multibyte-10.phpt
+++ b/ext/mbstring/tests/zend_multibyte-10.phpt
@@ -11,6 +11,8 @@ if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
 <?php
 declare(encoding="ISO-8859-15");
 declare(encoding="ISO-8859-1");
+echo "ok\n";
 ?>
 --EXPECTF--
-Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line 3
+ok
+

diff --git a/ext/mbstring/tests/zend_multibyte-11.phpt b/ext/mbstring/tests/zend_multibyte-11.phpt
index 84e16ae467153dfc048180438ba74ee525869f57..b79e4339ba552f6ca1d7584049bdf9e333d1d80f 100644 (file)
--- a/ext/mbstring/tests/zend_multibyte-11.phpt
+++ b/ext/mbstring/tests/zend_multibyte-11.phpt
@@ -11,7 +11,8 @@ if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
 <?php
 declare(encoding="ISO-8859-15") {
        declare(encoding="ISO-8859-1");
+       echo "ok\n";
 }
 ?>
 --EXPECTF--
-Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line 3
+ok