From: Hannes Magnusson <bjori@php.net>
Date: Sun, 27 Aug 2006 15:10:32 +0000 (+0000)
Subject: fix tests on freebsd
X-Git-Tag: php-4.4.5RC1~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=162e7f1ca5ba911a7627a8f958f3ffca92cab6fe;p=php

fix tests on freebsd
---

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 06aa9651f7..4e49c8517d 100644
--- a/tests/lang/034.phpt
+++ b/tests/lang/034.phpt
@@ -2,7 +2,7 @@
 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";
 }
 ?>
@@ -11,7 +11,7 @@ if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) {
 --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";
 ?>