diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-12-05 09:57:36 +0100 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-12-05 09:57:36 +0100 |
| commit | 73e66ff1bd9b0e79f766c144dacd2dbab6b960b7 (patch) | |
| tree | 842ca34af3e577c87709997713c422c062c7a011 | |
| parent | c3b6f6feed6ba4af04a90785988a104cd3ff1e54 (diff) | |
| parent | 94cbd6374adcb3e2ac15303dd47a212953f93e98 (diff) | |
| download | php-git-73e66ff1bd9b0e79f766c144dacd2dbab6b960b7.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Two tests deactivated until #63688 was fixed
| -rw-r--r-- | tests/lang/034.phpt | 4 | ||||
| -rw-r--r-- | tests/lang/bug30638.phpt | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt index 5d2c610926..cea0797d69 100644 --- a/tests/lang/034.phpt +++ b/tests/lang/034.phpt @@ -4,6 +4,10 @@ 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 30b70f30fb..945a228eda 100644 --- a/tests/lang/bug30638.phpt +++ b/tests/lang/bug30638.phpt @@ -2,6 +2,10 @@ 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') { |