MFB: fix skipifs

diff --git a/ext/standard/tests/strings/moneyformat.phpt b/ext/standard/tests/strings/moneyformat.phpt
index 21b542216aefe888b4df515ab2eb8872f1145ebb..923a58306ec0ae0cce171003bed0be10989ce70c 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 289926ae05780248c55df4937646d583bee9b771..ebea5dd8488ccabecc94c015fe37a48f1b802928 100644 (file)
--- a/ext/standard/tests/strings/setlocale_basic1.phpt
+++ b/ext/standard/tests/strings/setlocale_basic1.phpt
@@ -7,6 +7,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN')
 
 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

diff --git a/ext/standard/tests/strings/setlocale_basic2.phpt b/ext/standard/tests/strings/setlocale_basic2.phpt
index 4b05cc941297d85ed6b76398704ce93112cd14b5..7621e4468c52102c3c943b571e87a425db2708f7 100644 (file)
--- a/ext/standard/tests/strings/setlocale_basic2.phpt
+++ b/ext/standard/tests/strings/setlocale_basic2.phpt
@@ -6,6 +6,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN')
   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

diff --git a/ext/standard/tests/strings/setlocale_basic3.phpt b/ext/standard/tests/strings/setlocale_basic3.phpt
index dc131345228cbfe407c20aa89539add857c4fd70..30169ac7486af83b86a219ea7436c79391e299c4 100644 (file)
--- a/ext/standard/tests/strings/setlocale_basic3.phpt
+++ b/ext/standard/tests/strings/setlocale_basic3.phpt
@@ -6,6 +6,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN')
   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

diff --git a/ext/standard/tests/strings/setlocale_variation1.phpt b/ext/standard/tests/strings/setlocale_variation1.phpt
index ee886bc4a10cf48d62abb5089e7a111b7dfb7317..a3652e2f70f2827100884cafe888b91da1f8b1dc 100644 (file)
--- a/ext/standard/tests/strings/setlocale_variation1.phpt
+++ b/ext/standard/tests/strings/setlocale_variation1.phpt
@@ -6,6 +6,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN')
   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

diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt
index 070044fcec2a06421fb526886eb8d43d71329f8d..a09c6eafbe6505f3f4c9e30e235ff2d2c6040a90 100644 (file)
--- a/ext/standard/tests/strings/setlocale_variation3.phpt
+++ b/ext/standard/tests/strings/setlocale_variation3.phpt
@@ -6,6 +6,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN')
   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

diff --git a/ext/standard/tests/strings/setlocale_variation4.phpt b/ext/standard/tests/strings/setlocale_variation4.phpt
index 41dffa4320fe5a7ff31cf25798a72d70b41d088e..8044b33dc024dbe49a18a74545926579fe446e92 100644 (file)
--- a/ext/standard/tests/strings/setlocale_variation4.phpt
+++ b/ext/standard/tests/strings/setlocale_variation4.phpt
@@ -6,6 +6,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN')
   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;

diff --git a/ext/standard/tests/strings/setlocale_variation5.phpt b/ext/standard/tests/strings/setlocale_variation5.phpt
index 88c06900567e5e54120cb3761d2bf756f50edb4e..4a3436656d5a1738e39f7fe5647b0123cc786327 100644 (file)
--- a/ext/standard/tests/strings/setlocale_variation5.phpt
+++ b/ext/standard/tests/strings/setlocale_variation5.phpt
@@ -6,6 +6,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN')
   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;