diff options
| author | Hannes Magnusson <bjori@php.net> | 2006-08-27 15:06:53 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2006-08-27 15:06:53 +0000 |
| commit | a180abdbfd1216746b12edfd7aa0f783205e3a4b (patch) | |
| tree | 06c80ce0cc3214d7b9d6734c30ca36d48c3b20b7 | |
| parent | 46ce362ff33c6aea705124cc5e909a0eb657fe97 (diff) | |
| download | php-git-a180abdbfd1216746b12edfd7aa0f783205e3a4b.tar.gz | |
fix tests on freebsd
| -rw-r--r-- | ext/standard/tests/strings/htmlentities15.phpt | 4 | ||||
| -rw-r--r-- | tests/lang/034.phpt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/tests/strings/htmlentities15.phpt b/ext/standard/tests/strings/htmlentities15.phpt index a0e534aba0..2dc36e6f77 100644 --- a/ext/standard/tests/strings/htmlentities15.phpt +++ b/ext/standard/tests/strings/htmlentities15.phpt @@ -6,14 +6,14 @@ default_charset= mbstring.internal_encoding=none --SKIPIF-- <?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) { die("skip setlocale() failed\n"); } ?> --FILE-- <?php -setlocale(LC_CTYPE, "ru_RU.koi8r"); +setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R"); $str = "роскошный"; var_dump($str, htmlentities($str, ENT_QUOTES, '')); ?> diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt index 9c640415d5..211544a669 100644 --- a/tests/lang/034.phpt +++ b/tests/lang/034.phpt @@ -2,14 +2,14 @@ Bug #12647 (Locale settings affecting float parsing) --SKIPIF-- <?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"; } ?> --FILE-- <?php # 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"; ?> |