X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Funi%2Foverload.t;h=e4f4e132ea39889c98314dc6b31e75c2a56eecfc;hb=a2309040b8fe324ae09c064137c624b4292d93c1;hp=68a65e8df37d29174ef8ef7441979c3eb0d74c12;hpb=ce399ba62db9cda174a31da7c5310c71b8a9adc4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/uni/overload.t b/t/uni/overload.t
index 68a65e8..e4f4e13 100644
--- a/t/uni/overload.t
+++ b/t/uni/overload.t
@@ -48,46 +48,46 @@ foreach my $t ("ASCII", "B\366se") {
 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: {
 	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 @@ foreach my $operator ('print', 'syswrite', 'syswrite len', 'syswrite off',
 	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;