open my $fh, '<', $filename or die $!;
binmode( $fh, ':raw' );
my $content = <$fh>;
- is( $content, ascii_string(), 'Data written to file is there when we look for it later' );
+ is( $content, ascii_string(), 'Data written to file is there when we look for it later' );
}
{
my $dir = make_bad_file_1();
run_ok( "all_perl_files_ok( '$dir' )",
- qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 4: [\r]/m,
+ qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 5: [\r]/m,
'windows EOL found in tmp file 1' );
}
{
{
my ($dir, $file) = make_bad_file_3();
run_ok( "all_perl_files_ok( '$file' )",
- qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 9: [\r][\r][\r]/m,
+ qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 1: [\r]/m,
'windows EOL found in tmp file 3' );
}
{
my $dir = make_bad_file_4();
run_ok( "all_perl_files_ok({trailing_whitespace => 1}, '$dir' )",
- qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 13: [\s][\t][\s][\s]/m,
+ # Note that line number will be 13
+ qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 12: [\s][\t][\s][\s]/m,
'Trailing ws EOL found in tmp file 4' );
}
+{
+ my $dir = make_bad_file_5();
+ run_ok( "all_perl_files_ok({trailing_newline => 1}, '$dir' )",
+ qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 2: Missing "\n" at end of file/m,
+ 'Missing final newline found in tmp file 5' );
+}
+
+{
+ my $dir = make_bad_file_6();
+ run_ok( "all_perl_files_ok({trailing_newline => 1}, '$dir' )",
+ qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 2: 1 blank line at end of file/m,
+ 'Trailing blank line found in tmp file 6' );
+}
+
+{
+ my $dir = make_bad_file_7();
+ run_ok( "all_perl_files_ok({
+ trailing_whitespace => 1,
+ trailing_newline => 1,
+ all_reasons => 1,
+ }, '$dir' )",
+ qr/^not ok 1 - No incorrect line endings in '[^']*'.*^# line 2: \Q[\s]: [\s]\E.*^# line 2: 1 blank line at end of file.*^# line 2: Missing "\\n" at end of file/ms,
+ 'Trailing blank line found in tmp file 7' );
+}
+
sub run_ok {
my ($code, $match, $test_name) = @_;
- my $line = (caller)[2];
- die "code containing double quotes is not portable on Win32 in one-liners" if $code =~ /"/;
+ my (undef, $file, $line) = caller;
+ die "code containing double quotes is not portable on Win32 in one-liners at $file $line.\n" if $code =~ /"/;
+ local $Test::Builder::Level = $Test::Builder::Level + 1;
my (undef, $outfile) = tempfile();
- is( `$perl $inc -MTest::EOL -e "$code" > $outfile 2>&1`, '', "test sub program at line $line: output redirected" );
- is( $? >> 8, 1, "test sub program at line $line: exit code is 1" );
+ is( `$perl $inc -MTest::EOL -e "$code" > $outfile 2>&1`, '', "test sub program: output redirected" );
+ is( $? >> 8, 1, "test sub program: exit code is 1" );
local $/ = undef;
- open my $fh, '<', $outfile or die $!;
+ open my $fh, '<', $outfile or die "Can't open $outfile: $!";
my $content = <$fh>;
+ close $fh or die "Can't close $outfile: $!";
like( $content, $match, $test_name );
unlink $outfile;
}
-sub ascii_string {
+sub ascii_string {
my $o = "<before \r\n between \r\n after \n normal >";
return $o x 3;
}
-sub make_raw_badfile {
- my $tmpdir = tempdir( CLEANUP => 1 );
- my ( $fh, $filename ) = tempfile( DIR => $tmpdir, SUFFIX => '.tXt' );
+sub make_raw_badfile {
+ my $tmpdir = tempdir( CLEANUP => 1 );
+ my ( $fh, $filename ) = tempfile( DIR => $tmpdir, SUFFIX => '.tXt' );
binmode $fh, ':raw';
print $fh ascii_string();
close $fh;
#!perl
sub main {
+ # Note that the generated file will have the CRLF expanded in the source
print "Hello!\r\n";
}
DUMMY
=head1 NAME
test.pL - A test script
-\r\r\r\r\r\r\r\r
+\r\r\r\r\r\r\r\r
=cut
sub main {
- print "Hello!\n";
+ print "Hello!\\n";
}
DUMMY
return $tmpdir;
my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pm' );
binmode $fh, ':raw';
print $fh <<"DUMMY";
-use strict;\r
-\r
-package My::Test;\r
-\r
-sub new {\r
- my (\$class) = @_;\r
- my \$self = bless { }, \$class;\r
- return \$self;\r
-}\r\r\r\r
-
-\r
-1;\r
+use strict;\r
+\r
+package My::Test;\r
+\r
+sub new {\r
+ my (\$class) = \@_;\r
+ my \$self = bless { }, \$class;\r
+ return \$self;\r
+}\r
+\r
+\r
+1;\r
DUMMY
close $fh;
return ($tmpdir, $filename);
my $tmpdir = tempdir( CLEANUP => 1 );
my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pL' );
binmode $fh, ':raw';
- print $fh <<"DUMMY";
+ print $fh <<'DUMMY';
#!perl
=pod
sub main {
DUMMY
-print $fh qq{ print "Hello!\n"; \t \n}; # <-- whitespace
+print $fh qq{ print "Hello!\\n"; \t \n}; # <-- whitespace
print $fh '}';
return $tmpdir;
}
+sub make_bad_file_5 {
+ my $tmpdir = tempdir( CLEANUP => 1 );
+ my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pL' );
+ binmode $fh, ':raw';
+ print $fh "one line here\nno EOL here";
+ close $fh;
+ return $filename;
+}
+
+sub make_bad_file_6 {
+ my $tmpdir = tempdir( CLEANUP => 1 );
+ my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pL' );
+ binmode $fh, ':raw';
+ print $fh "blank line following here\n \n";
+ close $fh;
+ return $filename;
+}
+
+sub make_bad_file_7 {
+ my $tmpdir = tempdir( CLEANUP => 1 );
+ my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pL' );
+ binmode $fh, ':raw';
+ print $fh "blank trailing line without newline\n ";
+ close $fh;
+ return $filename;
+}
+