|
 |
70b90e2 |
--- ext/standard/tests/strings/setlocale_variation2.phpt.orig 2014-06-11 16:10:00.259326468 +0200
|
|
|
70b90e2 |
+++ ext/standard/tests/strings/setlocale_variation2.phpt 2014-06-11 16:16:14.396138997 +0200
|
|
|
70b90e2 |
@@ -52,6 +52,7 @@
|
|
|
70b90e2 |
//try different locale names
|
|
|
70b90e2 |
$failure_locale = array();
|
|
|
70b90e2 |
$success_count = 0;
|
|
|
70b90e2 |
+$expected = 0;
|
|
|
70b90e2 |
|
|
|
70b90e2 |
echo "-- Test setlocale() with all available locale in the system --\n";
|
|
|
70b90e2 |
// gather all locales installed in the system(stored $all_system_locales),
|
|
|
70b90e2 |
@@ -61,6 +62,10 @@
|
|
|
70b90e2 |
if(setlocale(LC_ALL,$value )){
|
|
|
70b90e2 |
$success_count++;
|
|
|
70b90e2 |
}
|
|
|
70b90e2 |
+ else if ($value == 'no_NO.ISO-8859-1') {
|
|
|
70b90e2 |
+ // ignore this one, see rhbz #971416
|
|
|
70b90e2 |
+ $expected++;
|
|
|
70b90e2 |
+ }
|
|
|
70b90e2 |
else{
|
|
|
70b90e2 |
//failure values are put in to an array $failure_locale
|
|
|
70b90e2 |
$failure_locale[] = $value;
|
|
|
70b90e2 |
@@ -69,11 +74,11 @@
|
|
|
70b90e2 |
|
|
|
70b90e2 |
echo "No of locales found on the machine = ".count($all_system_locales)."\n";
|
|
|
70b90e2 |
echo "No of setlocale() success = ".$success_count."\n";
|
|
|
70b90e2 |
-echo "Expected no of failures = 0\n";
|
|
|
70b90e2 |
+echo "Expected no of failures = $expected\n";
|
|
|
70b90e2 |
echo "Test ";
|
|
|
70b90e2 |
// check if there were any failure of setlocale() function earlier, if any
|
|
|
70b90e2 |
// failure then dump the list of failing locales
|
|
|
70b90e2 |
-if($success_count != count($all_system_locales)){
|
|
|
70b90e2 |
+if(($success_count + $expected) != count($all_system_locales)){
|
|
|
70b90e2 |
echo "FAILED\n";
|
|
|
70b90e2 |
echo "Names of locale() for which setlocale() failed ...\n";
|
|
|
70b90e2 |
var_dump($failure_locale);
|
|
|
70b90e2 |
@@ -89,6 +94,6 @@
|
|
|
70b90e2 |
-- Test setlocale() with all available locale in the system --
|
|
|
70b90e2 |
No of locales found on the machine = %d
|
|
|
70b90e2 |
No of setlocale() success = %d
|
|
|
70b90e2 |
-Expected no of failures = 0
|
|
|
70b90e2 |
+Expected no of failures = %d
|
|
|
70b90e2 |
Test PASSED
|
|
|
70b90e2 |
Done
|