12-fail.t: fix output redirection

[catagits/Test-EOL.git] / t / 12-fail.t

diff --git a/t/12-fail.t b/t/12-fail.t
index eef773b..dae6fc7 100644 (file)
--- a/t/12-fail.t
+++ b/t/12-fail.t
@@ -19,42 +19,42 @@ $inc = "-I $inc" if $inc;
 {
     my $dir = make_bad_file_1();
     my (undef, $outfile) = tempfile();
-    ok( `$perl $inc -MTest::EOL -e "all_perl_files_ok( '$dir' )" 2>&1 > $outfile` );
+    ok( `$perl $inc -MTest::EOL -e "all_perl_files_ok( '$dir' )" > $outfile 2>&1` );
     local $/ = undef;
     open my $fh, '<', $outfile or die $!;
     my $content = <$fh>;
-    like( $content, qr/^not ok 1 - No windows line endings in '[^']*' on line 4/m, 'windows EOL found in tmp file 1' );
+    like( $content, qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 4: [\r]/m, 'windows EOL found in tmp file 1' );
     unlink $outfile;
 }
 {
     my $dir = make_bad_file_2();
     my (undef, $outfile) = tempfile();
-    ok( `$perl $inc -MTest::EOL -e "all_perl_files_ok( '$dir' )" 2>&1 > $outfile` );
+    ok( `$perl $inc -MTest::EOL -e "all_perl_files_ok( '$dir' )" > $outfile 2>&1` );
     open my $fh, '<', $outfile or die $!;
     local $/ = undef;
     my $content = <$fh>;
-    like( $content, qr/^not ok 1 - No windows line endings in '[^']*' on line \d+/m, 'windows EOL found in tmp file2 ' );
+    like( $content, qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 8: [\r][\r][\r][\r][\r][\r][\r]/m, 'windows EOL found in tmp file2 ' );
     unlink $outfile;
 }
 {
     my ($dir, $file) = make_bad_file_3();
     my (undef, $outfile) = tempfile();
-    ok( `$perl $inc -MTest::EOL -e "all_perl_files_ok( '$file' )" 2>&1 > $outfile` );
+    ok( `$perl $inc -MTest::EOL -e "all_perl_files_ok( '$file' )" > $outfile 2>&1` );
     open my $fh, '<', $outfile or die $!;
     local $/ = undef;
     my $content = <$fh>;
-    like( $content, qr/^not ok 1 - No windows line endings in '[^']*' on line \d+/m, 'windows EOL found in tmp file 3' );
+    like( $content, qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 9: [\r][\r][\r]/m, 'windows EOL found in tmp file 3' );
     unlink $outfile;
 }
 
 {
     my $dir = make_bad_file_4();
     my (undef, $outfile) = tempfile();
-    ok( `$perl $inc -MTest::EOL -e "all_perl_files_ok({trailing_whitespace => 1}, '$dir' )" 2>&1 > $outfile` );
+    ok( `$perl $inc -MTest::EOL -e "all_perl_files_ok({trailing_whitespace => 1}, '$dir' )" > $outfile 2>&1` );
     open my $fh, '<', $outfile or die $!;
     local $/ = undef;
     my $content = <$fh>;
-    like( $content, qr/^not ok 1 - No windows line endings in '[^']*' on line \d+/m, 'windows EOL found in tmp file 4' );
+    like( $content, qr/^not ok 1 - No incorrect line endings in '[^']*' \Qon line 13: [\s][\t][\s][\s]/m, 'Trailing ws EOL found in tmp file 4' );
     unlink $outfile;
 }
 
@@ -66,7 +66,7 @@ sub ascii_string {
 sub make_raw_badfile { 
   my $tmpdir = tempdir( CLEANUP => 1 ); 
   my ( $fh, $filename ) = tempfile( DIR => $tmpdir, SUFFIX =>  '.tXt' ); 
-  binmode $fh, ':raw:utf8';
+  binmode $fh, ':raw';
   print $fh ascii_string();
   close $fh;
   return ( $tmpdir, $filename );
@@ -76,7 +76,7 @@ sub make_raw_badfile {
 sub make_bad_file_1 {
   my $tmpdir = tempdir( CLEANUP => 1 );
   my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pL' );
-  binmode $fh, ':raw:utf8';
+  binmode $fh, ':raw';
   my $str = <<"DUMMY";
 #!perl
 
@@ -92,7 +92,7 @@ DUMMY
 sub make_bad_file_2 {
   my $tmpdir = tempdir( CLEANUP => 1 );
   my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pL' );
-  binmode $fh, ':raw:utf8';
+  binmode $fh, ':raw';
   print $fh <<"DUMMY";
 #!perl
 
@@ -114,7 +114,7 @@ DUMMY
 sub make_bad_file_3 {
   my $tmpdir = tempdir( CLEANUP => 1 );
   my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pm' );
-  binmode $fh, ':raw:utf8';
+  binmode $fh, ':raw';
   print $fh <<"DUMMY";
 use strict;\r
 \r
@@ -136,7 +136,7 @@ DUMMY
 sub make_bad_file_4 {
   my $tmpdir = tempdir( CLEANUP => 1 );
   my ($fh, $filename) = tempfile( DIR => $tmpdir, SUFFIX => '.pL' );
-  binmode $fh, ':raw:utf8';
+  binmode $fh, ':raw';
   print $fh <<"DUMMY";
 #!perl
 
@@ -151,7 +151,7 @@ test.pL -   A test script
 sub main {
 DUMMY
 
-print $fh qq{    print "Hello!\n";   \n}; # <-- whitespace
+print $fh qq{    print "Hello!\n"; \t  \n}; # <-- whitespace
 print $fh '}';
 
   return $tmpdir;