bjori Sun Aug 27 15:06:15 2006 UTC
Modified files:
/php-src/ext/standard/tests/strings htmlentities15.phpt
/php-src/tests/lang 034.phpt
Log:
Fix tests on freebsd
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities15.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities15.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities15.phpt:1.2
php-src/ext/standard/tests/strings/htmlentities15.phpt:1.3
--- php-src/ext/standard/tests/strings/htmlentities15.phpt:1.2 Wed Aug 17
14:01:06 2005
+++ php-src/ext/standard/tests/strings/htmlentities15.phpt Sun Aug 27
15:06:15 2006
@@ -8,14 +8,14 @@
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, ''));
?>
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/034.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/tests/lang/034.phpt
diff -u php-src/tests/lang/034.phpt:1.8 php-src/tests/lang/034.phpt:1.9
--- php-src/tests/lang/034.phpt:1.8 Wed Nov 3 23:36:51 2004
+++ php-src/tests/lang/034.phpt Sun Aug 27 15:06:15 2006
@@ -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";
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
