Skip to content

Commit 73e66ff

Browse files
committed
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Two tests deactivated until #63688 was fixed
2 parents c3b6f6f + 94cbd63 commit 73e66ff

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

tests/lang/034.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ Bug #12647 (Locale settings affecting float parsing)
44
precision=14
55
--SKIPIF--
66
<?php # try to activate a german locale
7+
if (substr(PHP_OS, 0, 3) == 'WIN') {
8+
/* skip on windows until #63688 was fixed */
9+
die('skip');
10+
}
711
if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) {
812
print "skip Can't find german locale";
913
}

tests/lang/bug30638.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X)
33
--SKIPIF--
44
<?php # try to activate a german locale
5+
if (substr(PHP_OS, 0, 3) == 'WIN') {
6+
/* skip on windows until #63688 was fixed */
7+
die('skip');
8+
}
59
if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) {
610
print "skip setlocale() failed";
711
} elseif (strtolower(php_uname('s')) == 'darwin') {

0 commit comments

Comments
 (0)