From: krakjoe <joe.watkins@live.co.uk>
Date: Thu, 21 Aug 2014 09:03:48 +0000 (+0100)
Subject: remove bogus locale use from test
X-Git-Tag: php-5.6.4RC1~59^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7cbd8f8b8a662c1e74cb1c97dac6f606f8f477c9;p=php

remove bogus locale use from test
---

diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt
index 038ba58c5e..10ae22fe0c 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 )