diff options
| author | Jess Robinson <castaway@desert-island.me.uk> | 2013-02-08 12:30:05 +0000 |
|---|---|---|
| committer | Karl Williamson <public@khwilliamson.com> | 2013-02-09 20:54:45 -0700 |
| commit | 569f7fc5d4ec06501b46a72075ff434fe1bf4332 (patch) | |
| tree | 6b3b855017239faead78d324a7117899ea1bb25e /ext/re | |
| parent | d96f39bd4efb20c98c9664d264ae430b5904a2b8 (diff) | |
| download | perl-569f7fc5d4ec06501b46a72075ff434fe1bf4332.tar.gz | |
Enable perl core tests to pass when locale support is not available.
use locale - this will now die if $Config{d_setlocale} is not true.
All tests that use locale will skip if $Config{d_setlocale} is not true.
This enables us to pass tests on Android which uses ICU instead of locales.
The committer removed trailing white space
Diffstat (limited to 'ext/re')
| -rw-r--r-- | ext/re/t/re_funcs_u.t | 2 | ||||
| -rw-r--r-- | ext/re/t/reflags.t | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ext/re/t/re_funcs_u.t b/ext/re/t/re_funcs_u.t index 3eec2894d0..706437ec18 100644 --- a/ext/re/t/re_funcs_u.t +++ b/ext/re/t/re_funcs_u.t @@ -92,6 +92,7 @@ if ('1234'=~/(?:(?<A>\d)|(?<C>!))(?<B>\d)(?<A>\d)(?<B>\d)/){ SKIP: { skip_if_miniperl("no dynamic loading on miniperl, no POSIX", 3); + skip 'No locale testing without d_setlocale', 3 if(!$Config::Config{d_setlocale}); require POSIX; my $current_locale = POSIX::setlocale( &POSIX::LC_CTYPE, 'de_DE.ISO-8859-1' ); if ( !$current_locale || $current_locale ne 'de_DE.ISO-8859-1' ) { @@ -108,6 +109,7 @@ if ('1234'=~/(?:(?<A>\d)|(?<C>!))(?<B>\d)(?<A>\d)(?<B>\d)/){ SKIP: { skip_if_miniperl("no dynamic loading on miniperl, no POSIX", 3); + skip 'No locale testing without d_setlocale', 3 if(!$Config::Config{d_setlocale}); require POSIX; my $current_locale = POSIX::setlocale( &POSIX::LC_CTYPE, 'C' ); if ( !$current_locale || $current_locale ne 'C' ) { diff --git a/ext/re/t/reflags.t b/ext/re/t/reflags.t index b2cbf80d38..482b2c8066 100644 --- a/ext/re/t/reflags.t +++ b/ext/re/t/reflags.t @@ -60,7 +60,11 @@ SKIP: { ) { skip "no locale support", 7 } - use locale; + BEGIN { + if($Config::Config{d_setlocale}) { + require locale; import locale; + } + } use re '/u'; is qr//, '(?^u:)', 'use re "/u" with active locale'; no re '/u'; |