From: Nuno Lopes <nlopess@php.net>
Date: Sun, 27 Jan 2008 16:45:43 +0000 (+0000)
Subject: fix a bunch of SKIPIF (check for non available locales)
X-Git-Tag: RELEASE_1_3_1~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d16f4cad0a0550ce9c022c5082cd634518ac8a96;p=php

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 7f14b095ae..c045bb19c9 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 f753111755..957357f6c1 100644
--- 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 22629eb934..fe61b9b431 100644
--- 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 a8c53fd9e9..47917e34e4 100644
--- 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 92cf439276..5e21d0b79f 100644
--- 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 bfcdf37615..09d6c1186a 100644
--- 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 3968be102f..4ab1db7ad4 100644
--- 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 d2c3cf08a9..c8e947b09d 100644
--- 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;