fix a bunch of SKIPIF (check for non available locales)

diff --git a/ext/standard/tests/strings/moneyformat.phpt b/ext/standard/tests/strings/moneyformat.phpt
index 7f14b095aeb7b45e74663cf56863edee45fb6682..c045bb19c97c021af4c55a679624506db6a07391 100755 (executable)
--- a/ext/standard/tests/strings/moneyformat.phpt
+++ b/ext/standard/tests/strings/moneyformat.phpt
@@ -5,6 +5,10 @@ money_format test
        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

diff --git a/ext/standard/tests/strings/setlocale_basic1.phpt b/ext/standard/tests/strings/setlocale_basic1.phpt
index f753111755e19477de040247433367d698026d15..957357f6c1773fb939b8e41396127dfa6f246454 100644 (file)
--- a/ext/standard/tests/strings/setlocale_basic1.phpt
+++ b/ext/standard/tests/strings/setlocale_basic1.phpt
@@ -5,6 +5,9 @@ Test setlocale() function : basic functionality - setting system locale to a spe
 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

diff --git a/ext/standard/tests/strings/setlocale_basic2.phpt b/ext/standard/tests/strings/setlocale_basic2.phpt
index 22629eb9342f2e7f65a8218997a0f94bbcf64321..fe61b9b431229a516a892ab45aa14cd31cadf5a6 100644 (file)
--- a/ext/standard/tests/strings/setlocale_basic2.phpt
+++ b/ext/standard/tests/strings/setlocale_basic2.phpt
@@ -5,6 +5,9 @@ Test setlocale() function : basic functionality - set locale using an array
 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

diff --git a/ext/standard/tests/strings/setlocale_basic3.phpt b/ext/standard/tests/strings/setlocale_basic3.phpt
index a8c53fd9e928ad97208c79927acef3e0d83e43c0..47917e34e4bca9428db0f0d15901df247b93fcf6 100644 (file)
--- a/ext/standard/tests/strings/setlocale_basic3.phpt
+++ b/ext/standard/tests/strings/setlocale_basic3.phpt
@@ -5,6 +5,9 @@ Test setlocale() function : basic functionality - passing multiple locales as ar
 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

diff --git a/ext/standard/tests/strings/setlocale_variation1.phpt b/ext/standard/tests/strings/setlocale_variation1.phpt
index 92cf43927684aeea1ef1c7c5600a45d0856c2ac5..5e21d0b79fb021ef6f587527f8676411438bdaed 100644 (file)
--- a/ext/standard/tests/strings/setlocale_variation1.phpt
+++ b/ext/standard/tests/strings/setlocale_variation1.phpt
@@ -5,6 +5,9 @@ Test setlocale() function : usage variations - passing multiple valid/invlaid lo
 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

diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt
index bfcdf376153264a51c1ed74acf6bce0e892d2eba..09d6c1186a41323c1337c82fcc21f85f509ae711 100644 (file)
--- a/ext/standard/tests/strings/setlocale_variation3.phpt
+++ b/ext/standard/tests/strings/setlocale_variation3.phpt
@@ -5,6 +5,9 @@ Test setlocale() function : usage variations - setting system locale = 0
 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

diff --git a/ext/standard/tests/strings/setlocale_variation4.phpt b/ext/standard/tests/strings/setlocale_variation4.phpt
index 3968be102f7f78ae1e886df83ed46c03380ba4f7..4ab1db7ad4712beb5d7a81420a6ff82c429ee6b5 100644 (file)
--- a/ext/standard/tests/strings/setlocale_variation4.phpt
+++ b/ext/standard/tests/strings/setlocale_variation4.phpt
@@ -5,6 +5,9 @@ Test setlocale() function : usage variations - setting system locale as null
 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;

diff --git a/ext/standard/tests/strings/setlocale_variation5.phpt b/ext/standard/tests/strings/setlocale_variation5.phpt
index d2c3cf08a97e3a58e87a2701f74278a67a4cdd1b..c8e947b09d4f8bb864130e897ae046d8a0de6e9f 100644 (file)
--- a/ext/standard/tests/strings/setlocale_variation5.phpt
+++ b/ext/standard/tests/strings/setlocale_variation5.phpt
@@ -5,6 +5,9 @@ Test setlocale() function : usage variations - Setting system locale as empty st
 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;