cvs: php-src(PHP_5_3) /ext/standard/tests/strings moneyformat.phpt setlocale_basic1.phpt setlocale_basic2.phpt setlocale_basic3.phpt
setlocale_variation1.phpt setlocale_variation3.phpt setlocale_variation4.phpt setlocale_variation5.phpt

nlopess Sun Jan 27 16:45:43 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings moneyformat.phpt setlocale_basic1.phpt setlocale_basic2.phpt setlocale_basic3.phpt setlocale_variation1.phpt setlocale_variation3.phpt setlocale_variation4.phpt setlocale_variation5.phpt Log: fix a bunch of SKIPIF (check for non available locales) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/moneyformat.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/strings/moneyformat.phpt diff -u php-src/ext/standard/tests/strings/moneyformat.phpt:1.1.2.2 php-src/ext/standard/tests/strings/moneyformat.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/strings/moneyformat.phpt:1.1.2.2 Wed Jun 6 17:46:17 2007 +++ php-src/ext/standard/tests/strings/moneyformat.phpt Sun Jan 27 16:45:43 2008 @@ -5,6 +5,10 @@ if (!function_exists('money_format') || !function_exists('setlocale')) { die("SKIP money_format - not supported\n"); } + +if (setlocale(LC_MONETARY, 'en_US') == false) { + die('skip en_US locale not available'); +} ?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic1.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u Index: php-src/ext/standard/tests/strings/setlocale_basic1.phpt diff -u php-src/ext/standard/tests/strings/setlocale_basic1.phpt:1.1.4.3 php-src/ext/standard/tests/strings/setlocale_basic1.phpt:1.1.4.4 --- php-src/ext/standard/tests/strings/setlocale_basic1.phpt:1.1.4.3 Wed Dec 19 10:39:10 2007 +++ php-src/ext/standard/tests/strings/setlocale_basic1.phpt Sun Jan 27 16:45:43 2008 @@ -5,6 +5,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not valid for windows'); } +if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "de_DE.utf8", "es_EC.utf8", "fr_FR.utf8", "ja_JP.utf8", "el_GR.utf8", "nl_NL.utf8") === false) { + die('skip available locales not usable'); +} ?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic2.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/strings/setlocale_basic2.phpt diff -u php-src/ext/standard/tests/strings/setlocale_basic2.phpt:1.1.4.2 php-src/ext/standard/tests/strings/setlocale_basic2.phpt:1.1.4.3 --- php-src/ext/standard/tests/strings/setlocale_basic2.phpt:1.1.4.2 Fri Oct 5 19:32:28 2007 +++ php-src/ext/standard/tests/strings/setlocale_basic2.phpt Sun Jan 27 16:45:43 2008 @@ -5,6 +5,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not valid for windows'); } +if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "de_DE.utf8", "es_EC.utf8", "fr_FR.utf8", "ja_JP.utf8", "el_GR.utf8", "nl_NL.utf8") === false) { + die('skip available locales not usable'); +} ?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic3.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/strings/setlocale_basic3.phpt diff -u php-src/ext/standard/tests/strings/setlocale_basic3.phpt:1.1.4.2 php-src/ext/standard/tests/strings/setlocale_basic3.phpt:1.1.4.3 --- php-src/ext/standard/tests/strings/setlocale_basic3.phpt:1.1.4.2 Fri Oct 5 19:32:28 2007 +++ php-src/ext/standard/tests/strings/setlocale_basic3.phpt Sun Jan 27 16:45:43 2008 @@ -5,6 +5,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not valid for windows'); } +if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) { + die('skip en_US.utf8/Ko_KR.utf8/zh_CN.utf8 locales not available'); +} ?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/strings/setlocale_variation1.phpt diff -u php-src/ext/standard/tests/strings/setlocale_variation1.phpt:1.1.4.2 php-src/ext/standard/tests/strings/setlocale_variation1.phpt:1.1.4.3 --- php-src/ext/standard/tests/strings/setlocale_variation1.phpt:1.1.4.2 Fri Oct 5 19:32:28 2007 +++ php-src/ext/standard/tests/strings/setlocale_variation1.phpt Sun Jan 27 16:45:43 2008 @@ -5,6 +5,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not valid for windows'); } +if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) { + die('skip en_US.utf8/Ko_KR.utf8/zh_CN.utf8 locales not available'); +} ?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation3.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/strings/setlocale_variation3.phpt diff -u php-src/ext/standard/tests/strings/setlocale_variation3.phpt:1.1.4.2 php-src/ext/standard/tests/strings/setlocale_variation3.phpt:1.1.4.3 --- php-src/ext/standard/tests/strings/setlocale_variation3.phpt:1.1.4.2 Fri Oct 5 19:32:28 2007 +++ php-src/ext/standard/tests/strings/setlocale_variation3.phpt Sun Jan 27 16:45:43 2008 @@ -5,6 +5,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not valid for windows'); } +if (setlocale(LC_ALL,'en_US.utf8') === false) { + die('skip en_US.utf8 locale not available'); +} ?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation4.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/strings/setlocale_variation4.phpt diff -u php-src/ext/standard/tests/strings/setlocale_variation4.phpt:1.1.4.2 php-src/ext/standard/tests/strings/setlocale_variation4.phpt:1.1.4.3 --- php-src/ext/standard/tests/strings/setlocale_variation4.phpt:1.1.4.2 Fri Oct 5 19:32:28 2007 +++ php-src/ext/standard/tests/strings/setlocale_variation4.phpt Sun Jan 27 16:45:43 2008 @@ -5,6 +5,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not valid for windows'); } +if (setlocale(LC_ALL,'en_US.utf8') === false || setlocale(LC_ALL,'en_AU.utf8') === false) { + die('skip en_US.utf8/en_AU.utf8 locales not available'); +} ?> --ENV-- LC_ALL=en_US.utf8; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation5.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/strings/setlocale_variation5.phpt diff -u php-src/ext/standard/tests/strings/setlocale_variation5.phpt:1.1.4.2 php-src/ext/standard/tests/strings/setlocale_variation5.phpt:1.1.4.3 --- php-src/ext/standard/tests/strings/setlocale_variation5.phpt:1.1.4.2 Fri Oct 5 19:32:28 2007 +++ php-src/ext/standard/tests/strings/setlocale_variation5.phpt Sun Jan 27 16:45:43 2008 @@ -5,6 +5,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not valid for windows'); } +if (setlocale(LC_ALL,'en_AU.utf8') === false || setlocale(LC_ALL,'en_US.utf8') === false) { + die('skip en_AU.utf8/en_US.utf8 locales not available'); +} ?> --ENV-- LC_ALL=en_US.utf8;