com php-src: remove bogus locale use from test: ext/standard/te sts/strings/setlocale_variation2.phpt
| From: | Remi Collet | Date: | Wed, 01 Oct 2014 08:12:06 +0000 |
| Subject: | com php-src: remove bogus locale use from test: ext/standard/te sts/strings/setlocale_variation2.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82030@lists.php.net to get a copy of this message | ||
Commit: 7cbd8f8b8a662c1e74cb1c97dac6f606f8f477c9
Author: krakjoe <joe.watkins@live.co.uk> Thu, 21 Aug 2014 10:03:48 +0100
Committer: Remi Collet <remi@php.net> Wed, 1 Oct 2014 10:12:06 +0200
Parents: f584b67eaa20ecd2f63d5dd20c8fffe04b0fb11b
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7cbd8f8b8a662c1e74cb1c97dac6f606f8f477c9
Log:
remove bogus locale use from test
Changed paths:
M ext/standard/tests/strings/setlocale_variation2.phpt
Diff:
diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt
b/ext/standard/tests/strings/setlocale_variation2.phpt
index 038ba58..10ae22f 100644
--- a/ext/standard/tests/strings/setlocale_variation2.phpt
+++ b/ext/standard/tests/strings/setlocale_variation2.phpt
@@ -18,8 +18,11 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
/* setlocale() to set all available locales in the system and check the success count */
echo "*** Testing setlocale() : usage variations ***\n";
-function good_locale($locale) {
- return $locale !== 'tt_RU@iqtelif.UTF-8';
+function good_locale($locale) {
+ /**
+ * Note: no_NO is a bogus locale and should not be used, see https://bugzilla.redhat.com/show_bug.cgi?id=532487
+ **/
+ return $locale !== 'tt_RU@iqtelif.UTF-8' && substr($locale, 0, 5) !==
"no_NO";
}
/* Prototype : array list_system_locales( void )