From: Ævar Arnfjörð Bjarmason Date: Fri, 20 Jul 2007 00:05:45 +0000 (+0000) Subject: Report the lines win32 newlines are found at X-Git-Tag: 1.31.0-rc.0~52005 X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;ds=sidebyside;h=fade8559c4dc89cc048a557ce297af55b259e8de;p=lhc%2Fweb%2Fwiklou.git Report the lines win32 newlines are found at --- diff --git a/t/maint/unix-newlines.t b/t/maint/unix-newlines.t index 8a85a3d1e6..c47dd17cdb 100644 --- a/t/maint/unix-newlines.t +++ b/t/maint/unix-newlines.t @@ -5,23 +5,28 @@ use warnings; use Test::More;; use File::Find; -use File::Slurp qw< slurp >; -use Socket qw< $CRLF $LF >; +use Socket '$CRLF'; my $ext = qr/(?: t | pm | sql | js | php | inc | xml )/x; my @files; find( sub { push @files, $File::Find::name if -f && /\. $ext $/x }, '.' ); -plan tests => scalar @files; +plan 'no_plan'; for my $file (@files) { - my $cont = slurp $file; - if ( $cont and $cont =~ $CRLF ) { - pass "$file contains windows newlines"; - } else { - fail "$file is made of unix newlines and win"; - } + open my $fh, "<", $file or die "Can't open $file: $!"; + binmode $fh; + + my $ok = 1; + while (<$fh>) { + if (/$CRLF/) { + fail "$file has \\r\\n on line $."; + $ok = 0; + } + } + + pass "$file has only unix newlines" if $ok; }