From: Olivier Mengué Date: Sat, 8 Sep 2012 07:06:06 +0000 (+0200) Subject: RT#76037 12-fail.t: cleanup 'bad_file_3' => Win32 ok X-Git-Tag: 1.4~4 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FTest-EOL.git;a=commitdiff_plain;h=56109bab8e37a348860481e48c0b292ecf31bb6b RT#76037 12-fail.t: cleanup 'bad_file_3' => Win32 ok Cleanup the the last failing test on Win32: 'bad_file_3' generated file is now a pure Win32 file (without the fancy crazy \r it had before). The failure is now expected at line 1, instead of line 9 as the first line with \r is line 1. (I don't understand why Test::EOL was supposed to detect only fancy multiple \r instead of *any*). Now, all tests pass on Win32 (RT#76037)! --- diff --git a/t/12-fail.t b/t/12-fail.t index 7a6f9f0..a311f4d 100644 --- a/t/12-fail.t +++ b/t/12-fail.t @@ -31,7 +31,7 @@ $inc = "-I $inc" if $inc; { 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' ); } @@ -124,8 +124,8 @@ sub new {\r my (\$class) = \@_;\r my \$self = bless { }, \$class;\r return \$self;\r -}\r\r\r\r - +}\r +\r \r 1;\r DUMMY