More heuristics to make warnings.t pass under different

combinations of PERL_UNICODE / locale

p4raw-id: //depot/perl@29184

diff --git a/t/lib/common.pl b/t/lib/common.pl
index 6dad282..e188ab8 100644 (file)
--- a/t/lib/common.pl
+++ b/t/lib/common.pl
@@ -58,7 +58,11 @@ undef $/;
 
 plan tests => (scalar(@prgs)-$files);
 
-my $utf8_ok = exists $ENV{PERL_UNICODE} && $ENV{PERL_UNICODE} =~ m{^$|[Dio]} ? 1 : 0;
+my $utf8_ok = exists $ENV{PERL_UNICODE} && (
+    $ENV{PERL_UNICODE} =~ m{[Dio]}
+    || ($ENV{PERL_UNICODE} eq ""
+           && ($ENV{LC_ALL} =~ /\butf-?8\b/i || $ENV{LANG} =~ /\butf-?8\b/i))
+);
 
 for (@prgs){
     unless (/\n/)