pajoye          Thu Aug 21 12:24:24 2008 UTC

  Modified files:              
    /php-src/ext/standard/tests/strings strtoupper1.phpt 
  Log:
  - use 'C' (and enable it on windows)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtoupper1.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/strings/strtoupper1.phpt
diff -u php-src/ext/standard/tests/strings/strtoupper1.phpt:1.4 
php-src/ext/standard/tests/strings/strtoupper1.phpt:1.5
--- php-src/ext/standard/tests/strings/strtoupper1.phpt:1.4     Tue May 27 
10:50:47 2008
+++ php-src/ext/standard/tests/strings/strtoupper1.phpt Thu Aug 21 12:24:24 2008
@@ -2,8 +2,15 @@
 Test strtoupper() function
 --SKIPIF--
 <?php
-if ([EMAIL PROTECTED](LC_ALL, 'en-US.UTF-8'))
-  die('skip need "en-US.UTF-8" locale');
+if( substr(PHP_OS, 0, 3) == 'WIN') {
+  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');
+  }
+}
 ?>
 --FILE--
 <?php
@@ -12,8 +19,11 @@
    Description: 
      Returns string with all alphabetic characters converted to uppercase
 */ 
-
-setlocale(LC_ALL, 'en-US.UTF-8');
+if( substr(PHP_OS, 0, 3) == 'WIN') {
+  setlocale(LC_ALL, 'C');
+} else {
+  setlocale(LC_ALL, 'en-US.UTF-8');
+}
 
 echo "*** Testing strtoupper() 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

Reply via email to