From: H.Merijn Brand Date: Thu, 2 Nov 2006 17:49:53 +0000 (+0000) Subject: Change #29193 makes this addition unneeded X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6727fff1549ac0959bf3db3fb9ee2bdc2e31327c;p=p5sagit%2Fp5-mst-13.2.git Change #29193 makes this addition unneeded p4raw-id: //depot/perl@29195 --- diff --git a/t/lib/common.pl b/t/lib/common.pl index e188ab8..605bc2a 100644 --- a/t/lib/common.pl +++ b/t/lib/common.pl @@ -58,12 +58,6 @@ undef $/; plan tests => (scalar(@prgs)-$files); -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/) { @@ -77,11 +71,6 @@ for (@prgs){ $switch = $&; } my($prog,$expected) = split(/\nEXPECT(?:\n|$)/, $_, 2); - $expected =~ s{\b - UTF8 \s* - \? \s* '(.*?)' - : \s* '(.*?)' - }{$utf8_ok?$1:$2}gexs; my ($todo, $todo_reason); $todo = $prog =~ s/^#\s*TODO(.*)\n//m and $todo_reason = $1;