diff options
| author | Anatol Belski <ab@php.net> | 2014-12-06 12:00:17 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-06 12:00:17 +0100 |
| commit | ebaf130a15758134f9d8225bcf257d544461c5e1 (patch) | |
| tree | 685eafaeab47fc612a37465da6a49c1d3185ec08 /tests | |
| parent | b120f9beb2a0d07c8c16d9e6cc5b1226bb863d31 (diff) | |
| parent | 1b4d5ad46a60401bb3db754b4ef6888a7285e637 (diff) | |
| download | php-git-ebaf130a15758134f9d8225bcf257d544461c5e1.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #65230 setting locale randomly broken
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lang/034.phpt | 4 | ||||
| -rw-r--r-- | tests/lang/bug30638.phpt | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt index cea0797d69..5d2c610926 100644 --- a/tests/lang/034.phpt +++ b/tests/lang/034.phpt @@ -4,10 +4,6 @@ Bug #12647 (Locale settings affecting float parsing) precision=14 --SKIPIF-- <?php # try to activate a german locale -if (substr(PHP_OS, 0, 3) == 'WIN') { - /* skip on windows until #63688 was fixed */ - die('skip'); -} if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) { print "skip Can't find german locale"; } diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt index 945a228eda..30b70f30fb 100644 --- a/tests/lang/bug30638.phpt +++ b/tests/lang/bug30638.phpt @@ -2,10 +2,6 @@ Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X) --SKIPIF-- <?php # try to activate a german locale -if (substr(PHP_OS, 0, 3) == 'WIN') { - /* skip on windows until #63688 was fixed */ - die('skip'); -} if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) { print "skip setlocale() failed"; } elseif (strtolower(php_uname('s')) == 'darwin') { |