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