Integrate macperl patch #16868.

[perl5.git] / lib / utf8.t

diff --git a/lib/utf8.t b/lib/utf8.t
index acd64bf..8fc4481 100644 (file)
--- a/lib/utf8.t
+++ b/lib/utf8.t
@@ -13,6 +13,8 @@ EOF
     }
 }
 
+no utf8; # Ironic, no?
+
 # NOTE!
 #
 # Think carefully before adding tests here.  In general this should be
@@ -166,7 +168,7 @@ plan tests => 94;
     use utf8; %a = ("\xE1\xA0"=>"sterling");
     print 'start'; printf '%x,', ord \$_ foreach keys %a; print "end\n";
 BANG
-             qr/^Malformed UTF-8 character \(2 bytes, need 3.+\).*start\d+,end$/s
+             qr/^Malformed UTF-8 character \(\d bytes?, need \d, .+\).*start\d+,end$/sm
             ],
             );
     foreach (@tests) {