nlopess Sun Jan 27 16:52:34 2008 UTC
Modified files:
/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:
MFB: fix skipifs
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/moneyformat.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/strings/moneyformat.phpt
diff -u php-src/ext/standard/tests/strings/moneyformat.phpt:1.4
php-src/ext/standard/tests/strings/moneyformat.phpt:1.5
--- php-src/ext/standard/tests/strings/moneyformat.phpt:1.4 Mon Oct 1
12:01:28 2007
+++ php-src/ext/standard/tests/strings/moneyformat.phpt Sun Jan 27 16:52:34 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.3&r2=1.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.3
php-src/ext/standard/tests/strings/setlocale_basic1.phpt:1.4
--- php-src/ext/standard/tests/strings/setlocale_basic1.phpt:1.3 Wed Dec
19 10:37:42 2007
+++ php-src/ext/standard/tests/strings/setlocale_basic1.phpt Sun Jan 27
16:52:34 2008
@@ -7,6 +7,9 @@
if( ini_get("unicode.semantics") == "1")
die('skip do not run when unicode on');
+
+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.2&r2=1.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.2
php-src/ext/standard/tests/strings/setlocale_basic2.phpt:1.3
--- php-src/ext/standard/tests/strings/setlocale_basic2.phpt:1.2 Fri Oct
5 19:35:45 2007
+++ php-src/ext/standard/tests/strings/setlocale_basic2.phpt Sun Jan 27
16:52:34 2008
@@ -6,6 +6,8 @@
die('skip Not valid for windows');
if(ini_get("unicode.semantics") == "1")
die('skip do not run when unicode on');
+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.2&r2=1.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.2
php-src/ext/standard/tests/strings/setlocale_basic3.phpt:1.3
--- php-src/ext/standard/tests/strings/setlocale_basic3.phpt:1.2 Fri Oct
5 19:35:45 2007
+++ php-src/ext/standard/tests/strings/setlocale_basic3.phpt Sun Jan 27
16:52:34 2008
@@ -6,6 +6,8 @@
die('skip Not valid for windows');
if(ini_get("unicode.semantics") == "1")
die('skip do not run when unicode on');
+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.2&r2=1.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.2
php-src/ext/standard/tests/strings/setlocale_variation1.phpt:1.3
--- php-src/ext/standard/tests/strings/setlocale_variation1.phpt:1.2 Fri Oct
5 19:35:45 2007
+++ php-src/ext/standard/tests/strings/setlocale_variation1.phpt Sun Jan
27 16:52:34 2008
@@ -6,6 +6,8 @@
die('skip Not valid for windows');
if(ini_get("unicode.semantics") == "1")
die('skip do not run when unicode on');
+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.2&r2=1.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.2
php-src/ext/standard/tests/strings/setlocale_variation3.phpt:1.3
--- php-src/ext/standard/tests/strings/setlocale_variation3.phpt:1.2 Fri Oct
5 19:35:45 2007
+++ php-src/ext/standard/tests/strings/setlocale_variation3.phpt Sun Jan
27 16:52:34 2008
@@ -6,6 +6,8 @@
die('skip Not valid for windows');
if(ini_get("unicode.semantics") == "1")
die('skip do not run when unicode on');
+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.2&r2=1.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.2
php-src/ext/standard/tests/strings/setlocale_variation4.phpt:1.3
--- php-src/ext/standard/tests/strings/setlocale_variation4.phpt:1.2 Fri Oct
5 19:35:45 2007
+++ php-src/ext/standard/tests/strings/setlocale_variation4.phpt Sun Jan
27 16:52:34 2008
@@ -6,6 +6,8 @@
die('skip Not valid for windows');
if(ini_get("unicode.semantics") == "1")
die('skip do not run when unicode on');
+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.2&r2=1.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.2
php-src/ext/standard/tests/strings/setlocale_variation5.phpt:1.3
--- php-src/ext/standard/tests/strings/setlocale_variation5.phpt:1.2 Fri Oct
5 19:35:45 2007
+++ php-src/ext/standard/tests/strings/setlocale_variation5.phpt Sun Jan
27 16:52:34 2008
@@ -6,6 +6,8 @@
die('skip Not valid for windows');
if(ini_get("unicode.semantics") == "1")
die('skip do not run when unicode on');
+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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
