Upgrade perlfaq from version 5.20180605 to 5.0180915.

[perl5.git] / Porting / cmpVERSION.pl

diff --git a/Porting/cmpVERSION.pl b/Porting/cmpVERSION.pl
index 7964b9b..4041350 100755 (executable)
--- a/Porting/cmpVERSION.pl
+++ b/Porting/cmpVERSION.pl
@@ -42,7 +42,7 @@ unless (defined $tag_to_compare) {
         $check = `git describe --abbrev=0 $check 2>$null`;
         chomp $check;
         last unless $check =~ /-RC/;
-        $check .= '^';
+        $check .= '~1';
     }
     $tag_to_compare = $check;
     # Thanks to David Golden for this suggestion.
@@ -81,10 +81,23 @@ if ($exclude_upstream) {
 # usually because they pull in their version from some other file.
 my %skip;
 @skip{
+    'cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm', # just a test module
     'cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm', # just a test module
     'cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm',  # just a test module
+    'cpan/IO-Compress/lib/File/GlobMapper.pm', # upstream needs to supply $VERSION
+    'cpan/Math-BigInt/t/Math/BigFloat/Subclass.pm', # just a test module
+    'cpan/Math-BigInt/t/Math/BigInt/BareCalc.pm',   # just a test module
+    'cpan/Math-BigInt/t/Math/BigInt/Scalar.pm',     # just a test module
+    'cpan/Math-BigInt/t/Math/BigInt/Subclass.pm',   # just a test module
+    'cpan/Math-BigRat/t/Math/BigRat/Test.pm',       # just a test module
+    'cpan/podlators/t/lib/Test/Podlators.pm',       # just a test module
+    'cpan/podlators/t/lib/Test/RRA.pm',             # just a test module
+    'cpan/podlators/t/lib/Test/RRA/Config.pm',      # just a test module
+    'cpan/version/t/coretests.pm', # just a test module
     'dist/Attribute-Handlers/demo/MyClass.pm', # it's just demonstration code
     'dist/Exporter/lib/Exporter/Heavy.pm',
+    'dist/Module-CoreList/lib/Module/CoreList.pm',
+    'dist/Module-CoreList/lib/Module/CoreList/Utils.pm',
     'lib/Carp/Heavy.pm',
     'lib/Config.pm',           # no version number but contents will vary
     'win32/FindExt.pm',
@@ -159,6 +172,7 @@ unless (%module_diffs) {
 }
 
 printf "1..%d\n" => scalar keys %module_diffs if $tap;
+print "#\n# Comparing against $tag_to_compare ....\n#\n" if $tap;
 
 my $count;
 my $diff_cmd = "git --no-pager diff $tag_to_compare ";
@@ -177,19 +191,28 @@ foreach my $pm_file (sort keys %module_diffs) {
         print "ok $count - SKIP Can't parse \$VERSION in $pm_file\n"
           if $tap;
     } elsif (!defined $pm_version || $pm_version eq 'undef') {
-        print "not ok $count - in $pm_file version was $orig_pm_version, now unparsable\n" if $tap;
+        my $nok = "not ok $count - in $pm_file version was $orig_pm_version, now unparsable\n";
+        print $nok if $tap;
+        print STDERR "# $nok\n";
     } elsif ($pm_version ne $orig_pm_version) { # good
         print "ok $count - $pm_file\n" if $tap;
     } else {
        if ($tap) {
+            print "#\n# " . '-' x 75 . "\n"
+            . "# Version number ($pm_version) unchanged since"
+            . " $tag_to_compare, but contents have changed:\n#\n";
            foreach (sort @{$module_diffs{$pm_file}}) {
                print "# $_" for `$diff_cmd $q$_$q`;
            }
+            print "# " . '-' x 75 . "\n";
+
            if (exists $skip_versions{$pm_file}
                and grep $pm_version eq $_, @{$skip_versions{$pm_file}}) {
                print "ok $count - SKIP $pm_file version $pm_version\n";
            } else {
-               print "not ok $count - $pm_file version $pm_version\n";
+               my $nok = "not ok $count - $pm_file version $pm_version\n";
+               print $nok;
+               print STDERR "# $nok";
            }
        } else {
            push @diff, @{$module_diffs{$pm_file}};