Fix tests on freebsd

This commit is contained in:
Hannes Magnusson 2006-08-27 15:06:15 +00:00
parent ff035fb654
commit ea2891fa9d
2 changed files with 4 additions and 4 deletions

View file

@ -8,14 +8,14 @@ unicode.script_encoding=KOI-8
unicode.output_encoding=KOI-8 unicode.output_encoding=KOI-8
--SKIPIF-- --SKIPIF--
<?php <?php
$result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r"); $result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");
if (!$result || preg_match('/koi8/i', setlocale(LC_CTYPE, 0)) == 0) { if (!$result || preg_match('/koi8/i', setlocale(LC_CTYPE, 0)) == 0) {
die("skip setlocale() failed\n"); die("skip setlocale() failed\n");
} }
?> ?>
--FILE-- --FILE--
<?php <?php
setlocale(LC_CTYPE, "ru_RU.koi8r"); setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");
$str = "ÒÏÓËÏÛÎÙÊ"; $str = "ÒÏÓËÏÛÎÙÊ";
var_dump($str, htmlentities($str, ENT_QUOTES, '')); var_dump($str, htmlentities($str, ENT_QUOTES, ''));
?> ?>

View file

@ -2,14 +2,14 @@
Bug #12647 (Locale settings affecting float parsing) Bug #12647 (Locale settings affecting float parsing)
--SKIPIF-- --SKIPIF--
<?php # try to activate a german locale <?php # try to activate a german locale
if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) { if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1") === FALSE) {
print "skip"; print "skip";
} }
?> ?>
--FILE-- --FILE--
<?php <?php
# activate the german locale # activate the german locale
setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge"); setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1");
echo (float)"3.14", "\n"; echo (float)"3.14", "\n";
?> ?>