dmitry Tue, 22 Sep 2009 08:22:29 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288554
Log:
Fixed test (removed "bad" locale)
Changed paths:
U
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/setlocale_variation2.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/setlocale_variation2.phpt
Modified:
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/setlocale_variation2.phpt
===================================================================
---
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/setlocale_variation2.phpt
2009-09-22 07:58:15 UTC (rev 288553)
+++
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/setlocale_variation2.phpt
2009-09-22 08:22:29 UTC (rev 288554)
@@ -18,6 +18,10 @@
/* setlocale() to set all available locales in the system and check the
success count */
echo "*** Testing setlocale() : usage variations ***\n";
+function good_locale($locale) {
+ return $locale !== '[email protected]';
+}
+
/* Prototype : array list_system_locales( void )
* Description: To get the currently installed locle in this platform
* Arguments : Nil
@@ -38,8 +42,8 @@
$system_locales = explode("\n", $all_locales);
- // return all the locale found in the system
- return $system_locales;
+ // return all the locale found in the system, except for broken one
+ return array_filter($system_locales, 'good_locale');
}
// gather all the locales installed in the system
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/setlocale_variation2.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/setlocale_variation2.phpt
2009-09-22 07:58:15 UTC (rev 288553)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/setlocale_variation2.phpt
2009-09-22 08:22:29 UTC (rev 288554)
@@ -18,6 +18,10 @@
/* setlocale() to set all available locales in the system and check the
success count */
echo "*** Testing setlocale() : usage variations ***\n";
+function good_locale($locale) {
+ return $locale !== '[email protected]';
+}
+
/* Prototype : array list_system_locales( void )
* Description: To get the currently installed locle in this platform
* Arguments : Nil
@@ -38,8 +42,8 @@
$system_locales = explode("\n", $all_locales);
- // return all the locale found in the system
- return $system_locales;
+ // return all the locale found in the system, except for broken one
+ return array_filter($system_locales, 'good_locale');
}
// gather all the locales installed in the system
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
