From: Jarkko Hietaniemi Date: Sat, 13 Sep 2003 15:22:38 +0000 (+0000) Subject: More PerlIO warnings changes. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c4d88abd0953e77568d8da9de5cc9fc9a0f13fc6;p=p5sagit%2Fp5-mst-13.2.git More PerlIO warnings changes. p4raw-id: //depot/perl@21209 --- diff --git a/ext/PerlIO/t/fail.t b/ext/PerlIO/t/fail.t index 801793d..56e3d1d 100644 --- a/ext/PerlIO/t/fail.t +++ b/ext/PerlIO/t/fail.t @@ -23,7 +23,7 @@ $warn = ''; $! = 0; ok(!binmode(FH,":-)"),"All punctuation fails binmode"); print "# $!\n"; isnt($!,0,"Got errno"); -like($warn,qr/in layer/,"Got warning"); +like($warn,qr/in PerlIO layer/,"Got warning"); $warn = ''; $! = 0; ok(!binmode(FH,":nonesuch"),"Bad package fails binmode"); @@ -36,7 +36,7 @@ $warn = ''; $! = 0; ok(!open(FH,"<:-)",$file),"All punctuation fails open"); print "# $!\n"; isnt($!,"","Got errno"); -like($warn,qr/in layer/,"Got warning"); +like($warn,qr/in PerlIO layer/,"Got warning"); $warn = ''; $! = 0; ok(!open(FH,"<:nonesuch",$file),"Bad package fails open"); diff --git a/t/lib/warnings/perlio b/t/lib/warnings/perlio index cb39e90..e84e3de 100644 --- a/t/lib/warnings/perlio +++ b/t/lib/warnings/perlio @@ -8,16 +8,16 @@ Setting cnt to %d, ptr implies %d -perlio: invalid separator character %c%c%c in layer specification list %s +Invalid separator character %c%c%c in PerlIO layer specification %s open(F, ">:-aa", "bb") -perlio: argument list not closed for layer \"%.*s\"" +Argument list not closed for PerlIO layer \"%.*s\"" open(F, ">:aa(", "bb") -perlio: unknown layer \"%.*s\" +Unknown PerlIO layer \"%.*s\" # PerlIO/xyz.pm has 1; open(F, ">xyz", "bb") @@ -31,7 +31,7 @@ use warnings 'layer'; open(F, ">:-aa", "bb"); close F; EXPECT -perlio: invalid separator character '-' in layer specification list -aa at - line 6. +Invalid separator character '-' in PerlIO layer specification -aa at - line 6. ######## # perlio [PerlIO_parse_layers] @@ -41,7 +41,7 @@ use warnings 'layer'; open(F, ">:aa(", "bb"); close F; EXPECT -perlio: argument list not closed for layer "aa(" at - line 6. +Argument list not closed for PerlIO layer "aa(" at - line 6. ######## --FILE-- PerlIO/xyz.pm @@ -55,4 +55,4 @@ open(F, ">:xyz", "bb"); close F; END { 1 while unlink "bb" } # KEEP THIS WITH THE LAST TEST. EXPECT -perlio: unknown layer "xyz" at - line 5. +Unknown PerlIO layer "xyz" at - line 5.