MFH (skip conditions for tests)

diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt
index 245da08eb246bed7e2fe47501e806956a396bfaa..b36b41813e22f74c3357c7e4400ba02ae2342683 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail05.phpt
+++ b/ext/mbstring/tests/mb_send_mail05.phpt
@@ -5,6 +5,9 @@ mb_send_mail() test 5 (lang=Simplified Chinese)
 if (@mb_send_mail() === false || !mb_language("Simplified Chinese")) {
        die("skip mb_send_mail() not available");
 }
+if (!@mb_internal_encoding('GB2312')) {
+       die("skip GB2312 encoding is not avaliable on this platform");
+}
 ?>
 --INI--
 sendmail_path=cat

diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt
index f14a15c9ab769d626153fe47ab2608a9c56688eb..b8dafe58ccc2ee834ad3535693eaf5a2e393331e 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail06.phpt
+++ b/ext/mbstring/tests/mb_send_mail06.phpt
@@ -5,6 +5,9 @@ mb_send_mail() test 6 (lang=Traditional Chinese)
 if (@mb_send_mail() === false || !mb_language("Traditional Chinese")) {
        die("skip mb_send_mail() not available");
 }
+if (!@mb_internal_encoding('BIG5')) {
+       die("skip BIG5 encoding is not avaliable on this platform");
+}
 ?>
 --INI--
 sendmail_path=cat

diff --git a/ext/mbstring/tests/overload.phpt b/ext/mbstring/tests/overload.phpt
index 3e1fc44bf7cecf8784ec38e44416708350306956..ee745f58fe52f6a9872b3cf4444a436762956077 100644 (file)
--- a/ext/mbstring/tests/overload.phpt
+++ b/ext/mbstring/tests/overload.phpt
@@ -1,7 +1,12 @@
 --TEST--
 Function overloading test (said to be harmful)
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+<?php 
+       extension_loaded('mbstring') or die('skip mbstring not available'); 
+       if (!function_exists("mail")) {
+               die('skip mail() function is not available.');
+       }
+?>
 --INI--
 output_handler=
 mbstring.func_overload=7