From a895479719295830d96bc61225cccfca2a180edf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Jun 2015 17:26:59 +0200 Subject: php 5.4: add some patch to improve test results --- php-5.4.42-datetests-2.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 php-5.4.42-datetests-2.patch (limited to 'php-5.4.42-datetests-2.patch') diff --git a/php-5.4.42-datetests-2.patch b/php-5.4.42-datetests-2.patch new file mode 100644 index 0000000..fcddbc7 --- /dev/null +++ b/php-5.4.42-datetests-2.patch @@ -0,0 +1,54 @@ +Backport various fix from 5.6 + +From 7cbd8f8b8a662c1e74cb1c97dac6f606f8f477c9 Mon Sep 17 00:00:00 2001 +From: krakjoe +Date: Thu, 21 Aug 2014 10:03:48 +0100 +Subject: [PATCH] remove bogus locale use from test + +--- + ext/standard/tests/strings/setlocale_variation2.phpt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +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 ) +From 3e6f17673338034724c8b637c214b53a51a9db14 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 1 Oct 2014 10:14:14 +0200 +Subject: [PATCH] only no_NO.ISO-8859-1 have to be ignored + +--- + ext/standard/tests/strings/setlocale_variation2.phpt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt +index 10ae22f..5ebdfe8 100644 +--- a/ext/standard/tests/strings/setlocale_variation2.phpt ++++ b/ext/standard/tests/strings/setlocale_variation2.phpt +@@ -20,9 +20,9 @@ echo "*** Testing setlocale() : usage variations ***\n"; + + 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 ++ * Note: no_NO is a bogus locale and should not be used, see https://bugzilla.redhat.com/971416 + **/ +- return $locale !== 'tt_RU@iqtelif.UTF-8' && substr($locale, 0, 5) !== "no_NO"; ++ return $locale !== 'tt_RU@iqtelif.UTF-8' && $locale !== 'no_NO.ISO-8859-1'; + } + + /* Prototype : array list_system_locales( void ) -- cgit