geissert Sun, 21 Feb 2010 18:22:46 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=295311
Log:
Fix the name of the locale in some tests
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/strtoupper1.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strtoupper1.phpt
U php/php-src/trunk/ext/standard/tests/strings/strtoupper1.phpt
Modified:
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/strtoupper1.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/strtoupper1.phpt
2010-02-21 18:16:36 UTC (rev 295310)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/strtoupper1.phpt
2010-02-21 18:22:46 UTC (rev 295311)
@@ -2,8 +2,8 @@
Test strtoupper() function
--SKIPIF--
<?php
-if (!...@setlocale(LC_ALL, 'en-US.UTF-8'))
- die('skip need "en-US.UTF-8" locale');
+if (!...@setlocale(LC_ALL, 'en_US.UTF-8'))
+ die('skip need "en_US.UTF-8" locale');
?>
--FILE--
<?php
@@ -13,7 +13,7 @@
Returns string with all alphabetic characters converted to uppercase
*/
-setlocale(LC_ALL, 'en-US.UTF-8');
+setlocale(LC_ALL, 'en_US.UTF-8');
echo "*** Testing strtoupper() with all 256 chars ***\n";
for ($i=0; $i<=255; $i++){
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strtoupper1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strtoupper1.phpt
2010-02-21 18:16:36 UTC (rev 295310)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strtoupper1.phpt
2010-02-21 18:22:46 UTC (rev 295311)
@@ -8,7 +8,7 @@
}
} else {
if (!setlocale(LC_ALL, 'en_US.UTF-8', 'en')) {
- die('skip need "en-US.UTF-8" locale');
+ die('skip need "en_US.UTF-8" locale');
}
}
?>
@@ -22,7 +22,7 @@
if( substr(PHP_OS, 0, 3) == 'WIN') {
setlocale(LC_ALL, 'C');
} else {
- setlocale(LC_ALL, 'en-US.UTF-8');
+ setlocale(LC_ALL, 'en_US.UTF-8');
}
echo "*** Testing strtoupper() with all 256 chars ***\n";
Modified: php/php-src/trunk/ext/standard/tests/strings/strtoupper1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/strtoupper1.phpt
2010-02-21 18:16:36 UTC (rev 295310)
+++ php/php-src/trunk/ext/standard/tests/strings/strtoupper1.phpt
2010-02-21 18:22:46 UTC (rev 295311)
@@ -8,7 +8,7 @@
}
} else {
if (!setlocale(LC_ALL, 'en_US.UTF-8', 'en')) {
- die('skip need "en-US.UTF-8" locale');
+ die('skip need "en_US.UTF-8" locale');
}
}
?>
@@ -22,7 +22,7 @@
if( substr(PHP_OS, 0, 3) == 'WIN') {
setlocale(LC_ALL, 'C');
} else {
- setlocale(LC_ALL, 'en-US.UTF-8');
+ setlocale(LC_ALL, 'en_US.UTF-8');
}
echo "*** Testing strtoupper() with all 256 chars ***\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
