From 7ba37f79211552a9db2ed4ee3f9cd24587432e42 Mon Sep 17 00:00:00 2001
From: Rui Hirokawa <hirokawa@php.net>
Date: Sat, 14 Jan 2012 09:07:10 +0000
Subject: fixed failed tests (backport from PHP_5_4/trunk).

---
 ext/mbstring/tests/mb_ereg_search_pos.phpt | 2 +-
 ext/mbstring/tests/zend_multibyte-10.phpt  | 4 +++-
 ext/mbstring/tests/zend_multibyte-11.phpt  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'ext/mbstring/tests')

diff --git a/ext/mbstring/tests/mb_ereg_search_pos.phpt b/ext/mbstring/tests/mb_ereg_search_pos.phpt
index fcd98e16c6..08fcd7f87b 100644
--- 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 c3543c937a..89c7c1c26c 100644
--- 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 84e16ae467..b79e4339ba 100644
--- 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
-- 
cgit v1.2.1