diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2015-03-17 18:07:40 +0000 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2015-03-17 21:09:21 +0000 |
| commit | 9d20b1d38279c45cca2d6fb2d737b7f093401c7c (patch) | |
| tree | b61582aa159d1d1ea5e713ebffda4cf574d86cc6 | |
| parent | 2115c4364257369cad3f7690b8a7177b44be3525 (diff) | |
| download | perl-9d20b1d38279c45cca2d6fb2d737b7f093401c7c.tar.gz | |
Porting/core-cpan-diff: Don't ignore EOLs or whitespace
Turning off -b (ignore whitespace) revealed a whitespace difference lurking
in blead's copy of a NEXT test file, which there is no need for.
Turning on --binary revealed EOL differences in numerous Win32API-File
files. Hopefully a future CPAN release will fix those since the files in
its GitHub repo match blead as far as EOLs go already.
| -rwxr-xr-x | Porting/Maintainers.pl | 15 | ||||
| -rw-r--r-- | Porting/core-cpan-diff | 4 | ||||
| -rw-r--r-- | cpan/NEXT/t/actual.t | 2 | ||||
| -rw-r--r-- | t/porting/customized.dat | 9 |
4 files changed, 27 insertions, 3 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 85e1b1ba80..97a7e219c9 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1259,6 +1259,21 @@ use File::Glob qw(:case); 'EXCLUDED' => [ qr{^ex/}, ], + + # Currently all EOL differences. Waiting for a new upstream release: + # All the files in the GitHub repo have UNIX EOLs already. + 'CUSTOMIZED' => [ + qw( ExtUtils/Myconst2perl.pm + Makefile.PL + buffers.h + cFile.h + cFile.pc + const2perl.h + t/file.t + t/tie.t + typemap + ), + ], }, 'XSLoader' => { diff --git a/Porting/core-cpan-diff b/Porting/core-cpan-diff index d538c7ee1b..23ae99ffb3 100644 --- a/Porting/core-cpan-diff +++ b/Porting/core-cpan-diff @@ -53,7 +53,7 @@ Usage: $0 [opts] [ -d | -v | -x ] [ -a | module ... ] -d/--diff Display file differences using diff(1), rather than just listing which files have changed. ---diffopts Options to pass to the diff command. Defaults to '-u'. +--diffopts Options to pass to the diff command. Defaults to '-u --binary'. -f|force Force download from CPAN of new 02packages.details.txt file (with --crosscheck only). @@ -125,7 +125,7 @@ sub run { if ( $reverse || $use_diff || $diff_opts ); } else { - $diff_opts = '-u -b' unless defined $diff_opts; + $diff_opts = '-u --binary' unless defined $diff_opts; usage("can't use -f without --crosscheck") if $force; } diff --git a/cpan/NEXT/t/actual.t b/cpan/NEXT/t/actual.t index c24c2c022b..85ae285089 100644 --- a/cpan/NEXT/t/actual.t +++ b/cpan/NEXT/t/actual.t @@ -33,5 +33,5 @@ my $foo = {}; bless($foo,"A"); eval{ $foo->test } - ? fail("Didn't die on missing ancestor") + ? fail("Didn't die on missing ancestor") : pass("Correctly dies after full traversal"); diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 2d97fff3bc..fa37838db4 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -1,6 +1,15 @@ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 71ebcee355691ce374fcad251b12d8b2412462b3 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691 Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 9bae51c9b944cd5c0bbabe9d397e573976a2be8e +Win32API::File cpan/Win32API-File/buffers.h 02d230ac9ac7091365128161a0ed671898baefae +Win32API::File cpan/Win32API-File/cFile.h fca7e383e76979c3ac3adf12d11d1bcd2618e489 +Win32API::File cpan/Win32API-File/cFile.pc 992421eea7782a5957b64f66764f6ffb5093bee4 +Win32API::File cpan/Win32API-File/const2perl.h 521a12d359f5efb68cf8abe1977689b640bc8b7d +Win32API::File cpan/Win32API-File/ExtUtils/Myconst2perl.pm ce52544f49ac880e20b6171fe38f6560ed845e97 +Win32API::File cpan/Win32API-File/Makefile.PL 605d0aee31aebe84a99408f9ab5f644db57c61c6 +Win32API::File cpan/Win32API-File/t/file.t 124e64aa77e755235eb297644a87fac5388d3d78 +Win32API::File cpan/Win32API-File/t/tie.t 712ea7edd0cc805ce1c0b8172c01b03dd19b583d +Win32API::File cpan/Win32API-File/typemap 24bff088babeadac0873e8df390d1666d9d9db4a podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6 podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69 version cpan/version/lib/version.pm d0923b895d57f1d669ae36fcf85c87b16db341d1 |