[PHP-CVS] cvs: php-src /ext/standard/tests/strings strtolower.phpt

[Pierre-Alain Joye]

pajoye  Thu Aug 21 12:06:02 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/strings strtolower.phpt 
  Log:
  - MFB: use C instead of  (and enable it on windows)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtolower.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/standard/tests/strings/strtolower.phpt
diff -u php-src/ext/standard/tests/strings/strtolower.phpt:1.5 
php-src/ext/standard/tests/strings/strtolower.phpt:1.6
--- php-src/ext/standard/tests/strings/strtolower.phpt:1.5  Wed Aug 20 
13:54:13 2008
+++ php-src/ext/standard/tests/strings/strtolower.phpt  Thu Aug 21 12:06:02 2008
@@ -2,7 +2,12 @@
 Test strtolower() function
 --SKIPIF--
 ?php
-if ([EMAIL PROTECTED](LC_ALL, 'en_US.UTF-8', 'en'))
+if( substr(PHP_OS, 0, 3) == 'WIN') {
+  if (!setlocale(LC_ALL, 'C')) {
+die('skip need C locale (this windows is broken)');
+  }
+}
+if (!setlocale(LC_ALL, 'en_US.UTF-8', 'en'))
   die('skip need en-US.UTF-8 locale');
 ?
 --FILE--
@@ -12,8 +17,11 @@
Description:
  Returns string with all alphabetic characters converted to lowercase.
 */
-
-setlocale(LC_ALL, 'en_US.UTF-8', 'en');
+if( substr(PHP_OS, 0, 3) == 'WIN') {
+  setlocale(LC_ALL, 'C');
+} else {
+  setlocale(LC_ALL, 'en-US.UTF-8');
+}
 
 echo *** Testing strtolower() with all 256 chars ***\n;
 for ($i=0; $i=255; $i++){



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard/tests/strings strtolower.phpt

[Pierre-Alain Joye]

pajoye  Thu Aug 21 12:13:31 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/strings strtolower.phpt 
  Log:
  - don't skip if windows matches
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtolower.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/standard/tests/strings/strtolower.phpt
diff -u php-src/ext/standard/tests/strings/strtolower.phpt:1.6 
php-src/ext/standard/tests/strings/strtolower.phpt:1.7
--- php-src/ext/standard/tests/strings/strtolower.phpt:1.6  Thu Aug 21 
12:06:02 2008
+++ php-src/ext/standard/tests/strings/strtolower.phpt  Thu Aug 21 12:13:31 2008
@@ -6,9 +6,11 @@
   if (!setlocale(LC_ALL, 'C')) {
 die('skip need C locale (this windows is broken)');
   }
+} else {
+  if (!setlocale(LC_ALL, 'en_US.UTF-8', 'en')) {
+die('skip need en-US.UTF-8 locale');
+  }
 }
-if (!setlocale(LC_ALL, 'en_US.UTF-8', 'en'))
-  die('skip need en-US.UTF-8 locale');
 ?
 --FILE--
 ?php



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard/tests/strings strtolower.phpt

[Nuno Lopes]

nlopess Thu Sep 13 19:48:58 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/strings strtolower.phpt 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtolower.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/strings/strtolower.phpt
diff -u php-src/ext/standard/tests/strings/strtolower.phpt:1.2 
php-src/ext/standard/tests/strings/strtolower.phpt:1.3
--- php-src/ext/standard/tests/strings/strtolower.phpt:1.2  Fri Aug 10 
03:05:00 2007
+++ php-src/ext/standard/tests/strings/strtolower.phpt  Thu Sep 13 19:48:58 2007
@@ -2,8 +2,8 @@
 Test strtolower() function
 --SKIPIF--
 ?php
-if( (substr(PHP_OS, 0, 5) != Linux)  (@setlocale(LC_CTYPE, ) != 
en-US.UTF-8) )
-  die('skip Run only on Linux with locale as en-US.UTF-8');
+if ([EMAIL PROTECTED](LC_ALL, 'en-US.UTF-8'))
+  die('skip need en-US.UTF-8 locale');
 ?
 --FILE--
 ?php
@@ -13,6 +13,8 @@
  Returns string with all alphabetic characters converted to lowercase.
 */
 
+setlocale(LC_ALL, 'en-US.UTF-8');
+
 echo *** Testing strtolower() with all 256 chars ***\n;
 for ($i=0; $i=255; $i++){
   $char = chr($i);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php