Change 29873 by [EMAIL PROTECTED] on 2007/01/18 16:11:31
Integrate:
[ 28187]
Subject: t/uni/overload.t
From: Jarkko Hietaniemi <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
Date: Sat, 13 May 2006 11:27:56 +0300
[ 28575]
overload.t has same locale problem with VMS that it has with dec_osf
[ 29099]
Silence an expected warning (when playing with utf8ness and string
overloading)
Affected files ...
... //depot/maint-5.8/perl/t/uni/overload.t#2 integrate
Differences ...
==== //depot/maint-5.8/perl/t/uni/overload.t#2 (text) ====
Index: perl/t/uni/overload.t
--- perl/t/uni/overload.t#1~28169~ 2006-05-11 13:23:59.000000000 -0700
+++ perl/t/uni/overload.t 2007-01-18 08:11:31.000000000 -0800
@@ -48,46 +48,46 @@
my $u = UTF8Toggle->new("\311");
my $lc = lc $u;
is (length $lc, 1);
-is ($lc, "\311", "E accute -> e accute");
+is ($lc, "\311", "E acute -> e acute");
$lc = lc $u;
is (length $lc, 1);
-is ($lc, "\351", "E accute -> e accute");
+is ($lc, "\351", "E acute -> e acute");
$lc = lc $u;
is (length $lc, 1);
-is ($lc, "\311", "E accute -> e accute");
+is ($lc, "\311", "E acute -> e acute");
$u = UTF8Toggle->new("\351");
my $uc = uc $u;
is (length $uc, 1);
-is ($uc, "\351", "e accute -> E accute");
+is ($uc, "\351", "e acute -> E acute");
$uc = uc $u;
is (length $uc, 1);
-is ($uc, "\311", "e accute -> E accute");
+is ($uc, "\311", "e acute -> E acute");
$uc = uc $u;
is (length $uc, 1);
-is ($uc, "\351", "e accute -> E accute");
+is ($uc, "\351", "e acute -> E acute");
$u = UTF8Toggle->new("\311");
$lc = lcfirst $u;
is (length $lc, 1);
-is ($lc, "\311", "E accute -> e accute");
+is ($lc, "\311", "E acute -> e acute");
$lc = lcfirst $u;
is (length $lc, 1);
-is ($lc, "\351", "E accute -> e accute");
+is ($lc, "\351", "E acute -> e acute");
$lc = lcfirst $u;
is (length $lc, 1);
-is ($lc, "\311", "E accute -> e accute");
+is ($lc, "\311", "E acute -> e acute");
$u = UTF8Toggle->new("\351");
$uc = ucfirst $u;
is (length $uc, 1);
-is ($uc, "\351", "e accute -> E accute");
+is ($uc, "\351", "e acute -> E acute");
$uc = ucfirst $u;
is (length $uc, 1);
-is ($uc, "\311", "e accute -> E accute");
+is ($uc, "\311", "e acute -> E acute");
$uc = ucfirst $u;
is (length $uc, 1);
-is ($uc, "\351", "e accute -> E accute");
+is ($uc, "\351", "e acute -> E acute");
my $have_setlocale = 0;
eval {
@@ -101,51 +101,53 @@
skip "No setlocale", 24;
} elsif (!setlocale(&POSIX::LC_ALL, "en_GB.ISO8859-1")) {
skip "Could not setlocale to en_GB.ISO8859-1", 24;
+ } elsif ($^O eq 'dec_osf' || $^O eq 'VMS') {
+ skip "$^O has broken en_GB.ISO8859-1 locale", 24;
} else {
use locale;
my $u = UTF8Toggle->new("\311");
my $lc = lc $u;
is (length $lc, 1);
- is ($lc, "\351", "E accute -> e accute");
+ is ($lc, "\351", "E acute -> e acute");
$lc = lc $u;
is (length $lc, 1);
- is ($lc, "\351", "E accute -> e accute");
+ is ($lc, "\351", "E acute -> e acute");
$lc = lc $u;
is (length $lc, 1);
- is ($lc, "\351", "E accute -> e accute");
+ is ($lc, "\351", "E acute -> e acute");
$u = UTF8Toggle->new("\351");
my $uc = uc $u;
is (length $uc, 1);
- is ($uc, "\311", "e accute -> E accute");
+ is ($uc, "\311", "e acute -> E acute");
$uc = uc $u;
is (length $uc, 1);
- is ($uc, "\311", "e accute -> E accute");
+ is ($uc, "\311", "e acute -> E acute");
$uc = uc $u;
is (length $uc, 1);
- is ($uc, "\311", "e accute -> E accute");
+ is ($uc, "\311", "e acute -> E acute");
$u = UTF8Toggle->new("\311");
$lc = lcfirst $u;
is (length $lc, 1);
- is ($lc, "\351", "E accute -> e accute");
+ is ($lc, "\351", "E acute -> e acute");
$lc = lcfirst $u;
is (length $lc, 1);
- is ($lc, "\351", "E accute -> e accute");
+ is ($lc, "\351", "E acute -> e acute");
$lc = lcfirst $u;
is (length $lc, 1);
- is ($lc, "\351", "E accute -> e accute");
+ is ($lc, "\351", "E acute -> e acute");
$u = UTF8Toggle->new("\351");
$uc = ucfirst $u;
is (length $uc, 1);
- is ($uc, "\311", "e accute -> E accute");
+ is ($uc, "\311", "e acute -> E acute");
$uc = ucfirst $u;
is (length $uc, 1);
- is ($uc, "\311", "e accute -> E accute");
+ is ($uc, "\311", "e acute -> E acute");
$uc = ucfirst $u;
is (length $uc, 1);
- is ($uc, "\311", "e accute -> E accute");
+ is ($uc, "\311", "e acute -> E acute");
}
}
@@ -160,6 +162,7 @@
my $u = UTF8Toggle->new("$pad\311\n$trail");
my $l = UTF8Toggle->new("$pad\351\n$trail", 1);
if ($operator eq 'print') {
+ no warnings 'utf8';
print $fh $u;
print $fh $u;
print $fh $u;
End of Patch.
