improved zend-multibyte detection.

diff --git a/Zend/tests/multibyte/multibyte_encoding_004.phpt b/Zend/tests/multibyte/multibyte_encoding_004.phpt
index 31d9309bd57a4069d3ca320874da3ba9d15937ef..5a26b7c213c206ad74a0c6930655376615c5b130 100644 (file)
--- a/Zend/tests/multibyte/multibyte_encoding_004.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_004.phpt
@@ -2,9 +2,11 @@
 test for mbstring script_encoding for flex unsafe encoding (Shift_JIS)
 --SKIPIF--
 <?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-       die("skip zend-multibyte is not available");
+if (!in_array("detect_unicode", array_keys(ini_get_all()))) {
+  die("skip Requires configure --enable-zend-multibyte option");
+}
+if (!extension_loaded("mbstring")) {
+  die("skip Requires mbstring extension");
 }
 ?>
 --INI--

diff --git a/Zend/tests/multibyte/multibyte_encoding_005.phpt b/Zend/tests/multibyte/multibyte_encoding_005.phpt
index e75b58e0ac38040631ede9ad4141927deee8b5e3..3946238e5056de0ab0d7b50b26d52b6e5588c746 100644 (file)
--- a/Zend/tests/multibyte/multibyte_encoding_005.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_005.phpt
@@ -2,9 +2,11 @@
 encoding conversion from script encoding into internal encoding
 --SKIPIF--
 <?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-       die("skip zend-multibyte is not available");
+if (!in_array("detect_unicode", array_keys(ini_get_all()))) {
+  die("skip Requires configure --enable-zend-multibyte option");
+}
+if (!extension_loaded("mbstring")) {
+  die("skip Requires mbstring extension");
 }
 ?>
 --INI--