iliaa Thu Nov 14 09:19:04 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mbstring/tests mb_send_mail05.phpt mb_send_mail06.phpt
overload.phpt
Log:
MFH (skip conditions for tests)
Index: php4/ext/mbstring/tests/mb_send_mail05.phpt
diff -u php4/ext/mbstring/tests/mb_send_mail05.phpt:1.1
php4/ext/mbstring/tests/mb_send_mail05.phpt:1.1.2.1
--- php4/ext/mbstring/tests/mb_send_mail05.phpt:1.1 Wed Nov 13 03:45:37 2002
+++ php4/ext/mbstring/tests/mb_send_mail05.phpt Thu Nov 14 09:19:03 2002
@@ -5,6 +5,9 @@
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
Index: php4/ext/mbstring/tests/mb_send_mail06.phpt
diff -u php4/ext/mbstring/tests/mb_send_mail06.phpt:1.1
php4/ext/mbstring/tests/mb_send_mail06.phpt:1.1.2.1
--- php4/ext/mbstring/tests/mb_send_mail06.phpt:1.1 Wed Nov 13 07:00:47 2002
+++ php4/ext/mbstring/tests/mb_send_mail06.phpt Thu Nov 14 09:19:03 2002
@@ -5,6 +5,9 @@
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
Index: php4/ext/mbstring/tests/overload.phpt
diff -u php4/ext/mbstring/tests/overload.phpt:1.1
php4/ext/mbstring/tests/overload.phpt:1.1.2.1
--- php4/ext/mbstring/tests/overload.phpt:1.1 Fri Nov 8 02:22:10 2002
+++ php4/ext/mbstring/tests/overload.phpt Thu Nov 14 09:19:03 2002
@@ -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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
