diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-09-02 17:45:01 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-09-02 17:45:01 +0200 |
| commit | 46df59e5da7155edb7a87212863af57fd60bde29 (patch) | |
| tree | b1b4d2e5565d67a379c36277bef16dcda670b58e /php-5.6.0-noNO.patch | |
reorg repo
Diffstat (limited to 'php-5.6.0-noNO.patch')
| -rw-r--r-- | php-5.6.0-noNO.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/php-5.6.0-noNO.patch b/php-5.6.0-noNO.patch new file mode 100644 index 0000000..52f54ab --- /dev/null +++ b/php-5.6.0-noNO.patch @@ -0,0 +1,43 @@ +--- 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 |