From: Nuno Lopes <nlopess@php.net>
Date: Sun, 27 Jan 2008 16:52:34 +0000 (+0000)
Subject: MFB: fix skipifs
X-Git-Tag: RELEASE_2_0_0a1~764
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85adde057ee8f212c72b7afe9dcabbaae9b18166;p=php

MFB: fix skipifs
---

diff --git a/ext/standard/tests/strings/moneyformat.phpt b/ext/standard/tests/strings/moneyformat.phpt
index 21b542216a..923a58306e 100755
--- 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 289926ae05..ebea5dd848 100644
--- 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 4b05cc9412..7621e4468c 100644
--- 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 dc13134522..30169ac748 100644
--- 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 ee886bc4a1..a3652e2f70 100644
--- 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 070044fcec..a09c6eafbe 100644
--- 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 41dffa4320..8044b33dc0 100644
--- 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 88c0690056..4a3436656d 100644
--- 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;