From 8d8f6552caf46acea4ffeeb23c8b981b1c496c54 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Tue, 4 Jan 2011 22:01:09 +0000
Subject: [PATCH] - Fixed tests

---
 Zend/tests/declare_001.phpt | 16 +++++++++-------
 Zend/tests/ns_086.phpt      |  8 ++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Zend/tests/declare_001.phpt b/Zend/tests/declare_001.phpt
index cdd417db9b..007c01cdf0 100644
--- a/Zend/tests/declare_001.phpt
+++ b/Zend/tests/declare_001.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Testing declare statement with several type values
---SKIPIF--
-<?php
-if (ini_get("zend.multibyte")) {
-  die("skip Requires zend.multibyte=0");
-}
-?>
+--INI--
+zend.multibyte=1
 --FILE--
 <?php
 
@@ -19,4 +15,10 @@ print 'DONE';
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line 7
+Warning: Unsupported encoding [1] in %sdeclare_001.php on line %d
+
+Warning: Unsupported encoding [1.1231312321313E+18] in %sdeclare_001.php on line %d
+
+Warning: Unsupported encoding [] in %sdeclare_001.php on line %d
+
+Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line %d
\ No newline at end of file
diff --git a/Zend/tests/ns_086.phpt b/Zend/tests/ns_086.phpt
index ce3e2a6476..00657f6bde 100644
--- a/Zend/tests/ns_086.phpt
+++ b/Zend/tests/ns_086.phpt
@@ -1,5 +1,13 @@
 --TEST--
 086: bracketed namespace with encoding
+--SKIPIF--
+<?php
+if (!extension_loaded("mbstring")) {
+  die("skip Requires mbstring extension");
+}
+?>
+--INI--
+zend.multibyte=1
 --FILE--
 <?php
 declare(encoding='utf-8');
-- 
2.40.0