In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/b8ca42e11b4c854e920928a9cd8f979bb5972b1c?hp=8bc6a5d5cca817c4f9d1b6d4e82af9aa8b146b84>
- Log ----------------------------------------------------------------- commit b8ca42e11b4c854e920928a9cd8f979bb5972b1c Author: Jerry D. Hedden <[email protected]> Date: Wed Jul 29 13:47:53 2009 -0400 Add MANIFEST sort test M t/lib/manifest.t commit c372fac7e5ae6cc6782e6e58c1d62221916da784 Author: Nicholas Clark <[email protected]> Date: Wed Jul 29 19:00:26 2009 +0100 Sort the MANIFEST. M MANIFEST ----------------------------------------------------------------------- Summary of changes: MANIFEST | 2 +- t/lib/manifest.t | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/MANIFEST b/MANIFEST index 9d5370f..8288a47 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3777,9 +3777,9 @@ Porting/how_to_write_a_perldelta.pod Bluffer's guide to writing a perldelta. Porting/Maintainers Program to pretty print info in Maintainers.pl Porting/Maintainers.pl Information about maintainers Porting/Maintainers.pm Library to pretty print info in Maintainers.pl +Porting/make_dot_patch.pl Make a .patch file from a git WD Porting/makemeta Create the top-level META.yml Porting/makerel Release making utility -Porting/make_dot_patch.pl Make a .patch file from a git WD Porting/make_snapshot.pl Make a tgz snapshot of our tree with a .patch file in it Porting/manicheck Check against MANIFEST Porting/podtidy Reformat pod using Pod::Tidy diff --git a/t/lib/manifest.t b/t/lib/manifest.t index a98e974..ea40708 100644 --- a/t/lib/manifest.t +++ b/t/lib/manifest.t @@ -1,7 +1,6 @@ #!./perl -w -# Test the well formed-ness of the MANIFEST file. -# For now, just test that it uses tabs not spaces after the name of the file. +# Test the well-formed-ness of the MANIFEST file. BEGIN { chdir 't'; @@ -12,17 +11,16 @@ use strict; use File::Spec; require './test.pl'; -my $failed = 0; - plan('no_plan'); my $manifest = File::Spec->catfile(File::Spec->updir(), 'MANIFEST'); open my $m, '<', $manifest or die "Can't open '$manifest': $!"; +# Test that MANIFEST uses tabs - not spaces - after the name of the file. while (<$m>) { chomp; - next unless /\s/; + next unless /\s/; # Ignore lines without whitespace (i.e., filename only) my ($file, $separator) = /^(\S+)(\s+)/; isnt($file, undef, "Line $. doesn't start with a blank") or next; if ($separator !~ tr/\t//c) { @@ -31,7 +29,6 @@ while (<$m>) { } elsif ($separator !~ tr/ //c) { # It's all spaces fail("Spaces in entry for $file"); - next; } elsif ($separator =~ tr/\t//) { fail("Mixed tabs and spaces in entry for $file"); } else { @@ -41,4 +38,8 @@ while (<$m>) { close $m or die $!; -is($failed, 0, 'All lines are good'); +# Test that MANIFEST is properly sorted +my $sorted = `LC_ALL=C sort -fdc $manifest 2>&1`; +is($sorted, '', 'MANIFEST properly sorted'); + +# EOF -- Perl5 Master Repository
