Commit: 1a0c9ecaeee10b76895f6d67166187891777de8f Author: Anatoliy Belsky <a...@php.net> Tue, 10 Apr 2012 11:47:18 +0200 Parents: fbbad87056328b30d2b398cb78c3cf625f453e52 Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a0c9ecaeee10b76895f6d67166187891777de8f Log: Fixed bug #61631 mbstring mail related tests fail Bugs: https://bugs.php.net/61631 Changed paths: M ext/mbstring/tests/bug52861.phpt M ext/mbstring/tests/mb_send_mail01.phpt M ext/mbstring/tests/mb_send_mail02.phpt M ext/mbstring/tests/mb_send_mail03.phpt M ext/mbstring/tests/mb_send_mail04.phpt M ext/mbstring/tests/mb_send_mail05.phpt M ext/mbstring/tests/mb_send_mail06.phpt M ext/mbstring/tests/mb_send_mail07.phpt Diff: diff --git a/ext/mbstring/tests/bug52861.phpt b/ext/mbstring/tests/bug52861.phpt index dedd6eb..dc1914d 100644 --- a/ext/mbstring/tests/bug52861.phpt +++ b/ext/mbstring/tests/bug52861.phpt @@ -2,8 +2,8 @@ Bug #52681 (mb_send_mail() appends an extra MIME-Version header) --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == "WIN") { - die("skip Won't run on Windows"); +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); } if (!function_exists("mb_send_mail") || !mb_language("neutral")) { die("skip mb_send_mail() not available"); diff --git a/ext/mbstring/tests/mb_send_mail01.phpt b/ext/mbstring/tests/mb_send_mail01.phpt index 45ca0e6..8ed9ea9 100644 --- a/ext/mbstring/tests/mb_send_mail01.phpt +++ b/ext/mbstring/tests/mb_send_mail01.phpt @@ -2,8 +2,8 @@ mb_send_mail() test 1 (lang=neutral) --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == "WIN") { - die("skip Won't run on Windows"); +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); } if (!function_exists("mb_send_mail") || !mb_language("neutral")) { die("skip mb_send_mail() not available"); diff --git a/ext/mbstring/tests/mb_send_mail02.phpt b/ext/mbstring/tests/mb_send_mail02.phpt index 0eb1e36..923f571 100644 --- a/ext/mbstring/tests/mb_send_mail02.phpt +++ b/ext/mbstring/tests/mb_send_mail02.phpt @@ -2,8 +2,8 @@ mb_send_mail() test 2 (lang=Japanese) --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == "WIN") { - die("skip Won't run on Windows"); +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); } if (!function_exists("mb_send_mail") || !mb_language("japanese")) { die("skip mb_send_mail() not available"); diff --git a/ext/mbstring/tests/mb_send_mail03.phpt b/ext/mbstring/tests/mb_send_mail03.phpt index ca66fee..1b16529 100644 --- a/ext/mbstring/tests/mb_send_mail03.phpt +++ b/ext/mbstring/tests/mb_send_mail03.phpt @@ -2,8 +2,8 @@ mb_send_mail() test 3 (lang=English) --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == "WIN") { - die("skip Won't run on Windows"); +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); } if (!function_exists("mb_send_mail") || !mb_language("english")) { die("skip mb_send_mail() not available"); diff --git a/ext/mbstring/tests/mb_send_mail04.phpt b/ext/mbstring/tests/mb_send_mail04.phpt index a4170ff..fbff4cd 100644 --- a/ext/mbstring/tests/mb_send_mail04.phpt +++ b/ext/mbstring/tests/mb_send_mail04.phpt @@ -2,8 +2,8 @@ mb_send_mail() test 4 (lang=German) --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == "WIN") { - die("skip Won't run on Windows"); +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); } if (!function_exists("mb_send_mail") || !mb_language("german")) { die("skip mb_send_mail() not available"); diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt index 9870a00..aa68ab8 100644 --- a/ext/mbstring/tests/mb_send_mail05.phpt +++ b/ext/mbstring/tests/mb_send_mail05.phpt @@ -2,8 +2,8 @@ mb_send_mail() test 5 (lang=Simplified Chinese) --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == "WIN") { - die("skip Won't run on Windows"); +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); } if (!function_exists("mb_send_mail") || !mb_language("Simplified Chinese")) { die("skip mb_send_mail() not available"); diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt index 9a9e573..df3f065 100644 --- a/ext/mbstring/tests/mb_send_mail06.phpt +++ b/ext/mbstring/tests/mb_send_mail06.phpt @@ -2,8 +2,8 @@ mb_send_mail() test 6 (lang=Traditional Chinese) --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == "WIN") { - die("skip Won't run on Windows"); +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); } if (!function_exists("mb_send_mail") || !mb_language("Traditional Chinese")) { die("skip mb_send_mail() not available"); diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt index 192f89a..f62eccb 100644 --- a/ext/mbstring/tests/mb_send_mail07.phpt +++ b/ext/mbstring/tests/mb_send_mail07.phpt @@ -2,8 +2,8 @@ mb_send_mail() test 7 (lang=Korean) --SKIPIF-- <?php -if(substr(PHP_OS, 0, 3) == "WIN") { - die("skip Won't run on Windows"); +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); } if (!function_exists("mb_send_mail") || !mb_language("Korean")) { die("skip mb_send_mail() not available"); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
