From: Hannes Magnusson <bjori@php.net>
Date: Sun, 27 Aug 2006 15:06:15 +0000 (+0000)
Subject: Fix tests on freebsd
X-Git-Tag: RELEASE_1_0_0RC1~1874
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea2891fa9d30a375f190b482cb02b8130738b330;p=php

Fix tests on freebsd
---

diff --git a/ext/standard/tests/strings/htmlentities15.phpt b/ext/standard/tests/strings/htmlentities15.phpt
index 8828b827b1..5889becae8 100644
--- a/ext/standard/tests/strings/htmlentities15.phpt
+++ b/ext/standard/tests/strings/htmlentities15.phpt
@@ -8,14 +8,14 @@ unicode.script_encoding=KOI-8
 unicode.output_encoding=KOI-8
 --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";
 ?>