In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/eeb5a5dcd716cb4987f90467ecfbeb41708cdab7?hp=28ebb8fbe55693d0c0e563d623e0dfb234dd6971>
- Log ----------------------------------------------------------------- commit eeb5a5dcd716cb4987f90467ecfbeb41708cdab7 Author: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk> Date: Fri Oct 13 13:25:29 2017 +0100 Update Config-Perl-V to CPAN version 0.29 [DELTA] 0.29 - 12 Oct 2017, H.Merijn Brand * It's 2017 * Add test for 5.26.1-RC1 * Fix signature with argument * Ignore ccache and compiler path in signature ----------------------------------------------------------------------- Summary of changes: MANIFEST | 1 + Porting/Maintainers.pl | 2 +- cpan/Config-Perl-V/V.pm | 20 +++-- cpan/Config-Perl-V/t/10_base.t | 36 +++++++- cpan/Config-Perl-V/t/20_plv56.t | 7 +- cpan/Config-Perl-V/t/21_plv58.t | 7 +- cpan/Config-Perl-V/t/22_plv510.t | 7 +- cpan/Config-Perl-V/t/23_plv512.t | 7 +- cpan/Config-Perl-V/t/24_plv514.t | 7 +- cpan/Config-Perl-V/t/25_plv516.t | 7 +- cpan/Config-Perl-V/t/25_plv5162.t | 7 +- cpan/Config-Perl-V/t/26_plv518.t | 7 +- cpan/Config-Perl-V/t/26_plv5182.t | 7 +- cpan/Config-Perl-V/t/27_plv5200.t | 7 +- cpan/Config-Perl-V/t/27_plv5202.t | 7 +- cpan/Config-Perl-V/t/28_plv5220.t | 7 +- cpan/Config-Perl-V/t/28_plv52201w.t | 7 +- cpan/Config-Perl-V/t/29_plv5235w.t | 7 +- cpan/Config-Perl-V/t/30_plv5240.t | 7 +- cpan/Config-Perl-V/t/31_plv52511.t | 7 +- .../t/{31_plv52511.t => 32_plv5261rc1.t} | 97 +++++++++++----------- 21 files changed, 196 insertions(+), 72 deletions(-) copy cpan/Config-Perl-V/t/{31_plv52511.t => 32_plv5261rc1.t} (55%) diff --git a/MANIFEST b/MANIFEST index 7d70905b41..b5492edc76 100644 --- a/MANIFEST +++ b/MANIFEST @@ -243,6 +243,7 @@ cpan/Config-Perl-V/t/28_plv52201w.t Config::Perl::V cpan/Config-Perl-V/t/29_plv5235w.t Config::Perl::V cpan/Config-Perl-V/t/30_plv5240.t Config::Perl::V cpan/Config-Perl-V/t/31_plv52511.t Config::Perl::V +cpan/Config-Perl-V/t/32_plv5261rc1.t cpan/Config-Perl-V/V.pm Config::Perl::V cpan/CPAN/lib/App/Cpan.pm helper package for CPAN.pm cpan/CPAN/lib/CPAN.pm Interface to Comprehensive Perl Archive Network diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index d22c8ad58a..539fb5aadd 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -227,7 +227,7 @@ use File::Glob qw(:case); }, 'Config::Perl::V' => { - 'DISTRIBUTION' => 'HMBRAND/Config-Perl-V-0.27.tgz', + 'DISTRIBUTION' => 'HMBRAND/Config-Perl-V-0.29.tgz', 'FILES' => q[cpan/Config-Perl-V], 'EXCLUDED' => [qw( examples/show-v.pl diff --git a/cpan/Config-Perl-V/V.pm b/cpan/Config-Perl-V/V.pm index 9e9c09c9fa..4489cc83fc 100644 --- a/cpan/Config-Perl-V/V.pm +++ b/cpan/Config-Perl-V/V.pm @@ -8,7 +8,7 @@ use warnings; use Config; use Exporter; use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS); -$VERSION = "0.28"; +$VERSION = "0.29"; @ISA = qw( Exporter ); @EXPORT_OK = qw( plv2hash summary myconfig signature ); %EXPORT_TAGS = ( @@ -310,8 +310,11 @@ sub plv2hash { sub summary { my $conf = shift || myconfig (); - ref $conf eq "HASH" && - exists $conf->{config} && exists $conf->{build} or return; + ref $conf eq "HASH" + && exists $conf->{config} + && exists $conf->{build} + && ref $conf->{config} eq "HASH" + && ref $conf->{build} eq "HASH" or return; my %info = map { exists $conf->{config}{$_} ? ( $_ => $conf->{config}{$_} ) : () } @@ -328,10 +331,15 @@ sub summary { } # summary sub signature { + my $no_md5 = "0" x 32; + my $conf = summary (shift) or return $no_md5; + eval { require Digest::MD5 }; - $@ and return "00000000000000000000000000000000"; + $@ and return $no_md5; + + $conf->{cc} =~ s{.*\bccache\s+}{}; + $conf->{cc} =~ s{.*[/\\]}{}; - my $conf = shift || summary (); delete $conf->{config_args}; return Digest::MD5::md5_hex (join "\xFF" => map { "$_=".(defined $conf->{$_} ? $conf->{$_} : "\xFE"); @@ -546,7 +554,7 @@ H.Merijn Brand <h.m.br...@xs4all.nl> =head1 COPYRIGHT AND LICENSE -Copyright (C) 2009-2016 H.Merijn Brand +Copyright (C) 2009-2017 H.Merijn Brand This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/cpan/Config-Perl-V/t/10_base.t b/cpan/Config-Perl-V/t/10_base.t index 6113828f06..c4deda0dde 100644 --- a/cpan/Config-Perl-V/t/10_base.t +++ b/cpan/Config-Perl-V/t/10_base.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 12; + my $tests = 42; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -26,6 +26,19 @@ ok (my $info1 = Config::Perl::V::summary ($conf), "Get a summary for \$conf"); ok (my $info2 = Config::Perl::V::summary, "Get a summary for \$^X"); is_deeply ($info1, $info2, "Info should match"); +ok (my $sig = Config::Perl::V::signature, "Get signature"); +like ($sig, qr{^[0-9a-f]{32}$}, "Valid md5"); + +my $no_md5 = "0" x 32; +ok (my $bad = Config::Perl::V::signature ({ cfg => 0 }), "Signature on invalid data"); +is ($bad, $no_md5, "Invalid md5"); +ok ( $bad = Config::Perl::V::signature ({ config => {} }), "Signature on incomplete data"); +is ($bad, $no_md5, "Invalid md5"); +ok ( $bad = Config::Perl::V::signature ({ config => 0, build => {} }), "Signature on invalid data"); +is ($bad, $no_md5, "Invalid md5"); +ok ( $bad = Config::Perl::V::signature ({ config => {}, build => 0 }), "Signature on invalid data"); +is ($bad, $no_md5, "Invalid md5"); + SKIP: { # Test that the code that shells out to perl -V and parses the output # gives the same results as the code that calls Config::* routines directly. @@ -36,3 +49,24 @@ SKIP: { is_deeply (Config::Perl::V::myconfig, $conf, "perl -V parsing code produces same result as the Config module"); } + +$ENV{CPV_TEST_ENV} = 42; +ok ($conf = Config::Perl::V::myconfig ({ env => qr{^CPV_TEST_ENV$} }), "Read config plus ENV"); +ok (exists $conf->{$_}, "Has $_ entry") for qw( build environment config inc environment ); +ok (my $eh = $conf->{environment}, "Get ENV from conf"); +is ($eh->{CPV_TEST_ENV}, 42, "Valid entry"); + +ok ($conf = Config::Perl::V::myconfig ([ env => qr{^CPV_TEST_ENV$} ]), "Read config plus ENV"); +ok (exists $conf->{$_}, "Has $_ entry") for qw( build environment config inc environment ); +ok ($eh = $conf->{environment}, "Get ENV from conf"); +is ($eh->{CPV_TEST_ENV}, 42, "Valid entry"); + +ok ($conf = Config::Perl::V::myconfig ( env => qr{^CPV_TEST_ENV$} ), "Read config invalid arguments"); +is ($conf->{environment}{CPV_TEST_ENV}, undef, "No entry"); + +delete $INC{"Digest/MD5.pm"}; +delete $INC{"Digest/base.pm"}; +$INC{"Digest/MD5"} = "./flooble/blurgh/Digest/MD5.pm"; +local @INC = ("xyzzy$$"); # Should be unable to find Digest::MD5 +ok ($sig = Config::Perl::V::signature, "Get signature (No Digest::MD5)"); +is ($sig, $no_md5, "Valid md5"); diff --git a/cpan/Config-Perl-V/t/20_plv56.t b/cpan/Config-Perl-V/t/20_plv56.t index 445531b15c..a7e9f9ea34 100644 --- a/cpan/Config-Perl-V/t/20_plv56.t +++ b/cpan/Config-Perl-V/t/20_plv56.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 97; + my $tests = 99; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -36,6 +36,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "9dc187182be100c1713f210a8c6d9f45"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + __END__ Summary of my perl5 (revision 5.0 version 6 subversion 2) configuration: Platform: diff --git a/cpan/Config-Perl-V/t/21_plv58.t b/cpan/Config-Perl-V/t/21_plv58.t index 39f0352333..a7b797bcb7 100644 --- a/cpan/Config-Perl-V/t/21_plv58.t +++ b/cpan/Config-Perl-V/t/21_plv58.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 97; + my $tests = 99; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -39,6 +39,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "df48dce1adaaf63855d8acd455c51818"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + __END__ Summary of my perl5 (revision 5 version 8 subversion 9) configuration: Platform: diff --git a/cpan/Config-Perl-V/t/22_plv510.t b/cpan/Config-Perl-V/t/22_plv510.t index 430410c039..51ba142df6 100644 --- a/cpan/Config-Perl-V/t/22_plv510.t +++ b/cpan/Config-Perl-V/t/22_plv510.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 96; + my $tests = 98; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -29,6 +29,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "ce0a7871dfddbbed0a6c685c0f52dbf9"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + __END__ Summary of my perl5 (revision 5 version 10 subversion 0) configuration: Platform: diff --git a/cpan/Config-Perl-V/t/23_plv512.t b/cpan/Config-Perl-V/t/23_plv512.t index 572fef0740..00479ba99e 100644 --- a/cpan/Config-Perl-V/t/23_plv512.t +++ b/cpan/Config-Perl-V/t/23_plv512.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 98; + my $tests = 100; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -39,6 +39,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "a2c38153cc47d340bc140d0bfe294afb"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + __END__ Summary of my perl5 (revision 5 version 12 subversion 2) configuration: diff --git a/cpan/Config-Perl-V/t/24_plv514.t b/cpan/Config-Perl-V/t/24_plv514.t index abaceb1225..db2ac2a331 100644 --- a/cpan/Config-Perl-V/t/24_plv514.t +++ b/cpan/Config-Perl-V/t/24_plv514.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 98; + my $tests = 100; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -40,6 +40,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "778815a670c0c454738aedf0c88930ba"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + __END__ Summary of my perl5 (revision 5 version 14 subversion 2) configuration: diff --git a/cpan/Config-Perl-V/t/25_plv516.t b/cpan/Config-Perl-V/t/25_plv516.t index f91279ac67..6315223fb6 100644 --- a/cpan/Config-Perl-V/t/25_plv516.t +++ b/cpan/Config-Perl-V/t/25_plv516.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 97; + my $tests = 99; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -40,6 +40,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "7b00cf3b306d96fa802892e6ad4b070f"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + __END__ Summary of my perl5 (revision 5 version 16 subversion 3) configuration: diff --git a/cpan/Config-Perl-V/t/25_plv5162.t b/cpan/Config-Perl-V/t/25_plv5162.t index 2bab6643fb..aed85b91b7 100644 --- a/cpan/Config-Perl-V/t/25_plv5162.t +++ b/cpan/Config-Perl-V/t/25_plv5162.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 155; + my $tests = 157; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -42,6 +42,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "2917ca2a97b6db1ab8fb08798f53c0bb"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + is_deeply ($conf->{build}{patches}, [ "/Library/Perl/Updates/<version> comes before system perl directories", "installprivlib and installarchlib points to the Updates directory", diff --git a/cpan/Config-Perl-V/t/26_plv518.t b/cpan/Config-Perl-V/t/26_plv518.t index 08f275b15c..cedc734274 100644 --- a/cpan/Config-Perl-V/t/26_plv518.t +++ b/cpan/Config-Perl-V/t/26_plv518.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 116; + my $tests = 118; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -40,6 +40,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "8f46b07a7775e6a92347d4cd564b8f03"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + is_deeply ($conf->{build}{patches}, [], "No local patches"); my %check = ( diff --git a/cpan/Config-Perl-V/t/26_plv5182.t b/cpan/Config-Perl-V/t/26_plv5182.t index f25e42e976..178fb92612 100644 --- a/cpan/Config-Perl-V/t/26_plv5182.t +++ b/cpan/Config-Perl-V/t/26_plv5182.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 116; + my $tests = 118; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -40,6 +40,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "874325856acfea3dab7e7c944660f398"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + is_deeply ($conf->{build}{patches}, [], "No local patches"); my %check = ( diff --git a/cpan/Config-Perl-V/t/27_plv5200.t b/cpan/Config-Perl-V/t/27_plv5200.t index 8e8ce8ecb9..4d9b400ebf 100644 --- a/cpan/Config-Perl-V/t/27_plv5200.t +++ b/cpan/Config-Perl-V/t/27_plv5200.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 116; + my $tests = 118; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -43,6 +43,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "3e7b4513cd80c6ef00fcd77e5e16f8b4"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + is_deeply ($conf->{build}{patches}, [], "No local patches"); my %check = ( diff --git a/cpan/Config-Perl-V/t/27_plv5202.t b/cpan/Config-Perl-V/t/27_plv5202.t index 9faf121711..33396be3a2 100644 --- a/cpan/Config-Perl-V/t/27_plv5202.t +++ b/cpan/Config-Perl-V/t/27_plv5202.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 117; + my $tests = 119; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -43,6 +43,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "9f954ebc2be7b1d7e151ab28dbdf7062"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + is_deeply ($conf->{build}{patches}, [], "No local patches"); my %check = ( diff --git a/cpan/Config-Perl-V/t/28_plv5220.t b/cpan/Config-Perl-V/t/28_plv5220.t index e9a07c4e8a..77bc99d797 100644 --- a/cpan/Config-Perl-V/t/28_plv5220.t +++ b/cpan/Config-Perl-V/t/28_plv5220.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 117; + my $tests = 119; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -43,6 +43,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "ddcc2d51e43bf18f5234ba66529068ef"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + is_deeply ($conf->{build}{patches}, [], "No local patches"); my %check = ( diff --git a/cpan/Config-Perl-V/t/28_plv52201w.t b/cpan/Config-Perl-V/t/28_plv52201w.t index 1043dfa0ce..1ec81a45e1 100644 --- a/cpan/Config-Perl-V/t/28_plv52201w.t +++ b/cpan/Config-Perl-V/t/28_plv52201w.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 117; + my $tests = 119; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -43,6 +43,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "dfb32b8299b66e8bdb2712934f700d94"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + is_deeply ($conf->{build}{patches}, [], "No local patches"); my %check = ( diff --git a/cpan/Config-Perl-V/t/29_plv5235w.t b/cpan/Config-Perl-V/t/29_plv5235w.t index 2c23e42362..26d3281907 100644 --- a/cpan/Config-Perl-V/t/29_plv5235w.t +++ b/cpan/Config-Perl-V/t/29_plv5235w.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 117; + my $tests = 119; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -43,6 +43,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "bccd5d78dfebd48b89faf7f1fe711733"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + is_deeply ($conf->{build}{patches}, [], "No local patches"); my %check = ( diff --git a/cpan/Config-Perl-V/t/30_plv5240.t b/cpan/Config-Perl-V/t/30_plv5240.t index b43b46f518..6b717d69e7 100644 --- a/cpan/Config-Perl-V/t/30_plv5240.t +++ b/cpan/Config-Perl-V/t/30_plv5240.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 125; + my $tests = 127; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -41,6 +41,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "3dffae79f6d2c74073f0d64646709101"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + is_deeply ($conf->{build}{patches}, [], "No local patches"); my %check = ( diff --git a/cpan/Config-Perl-V/t/31_plv52511.t b/cpan/Config-Perl-V/t/31_plv52511.t index b3c09cd522..762a63d2e8 100644 --- a/cpan/Config-Perl-V/t/31_plv52511.t +++ b/cpan/Config-Perl-V/t/31_plv52511.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 125; + my $tests = 127; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -41,6 +41,11 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "f0e463400e40ca35b67cec3834b5b9b7"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + is_deeply ($conf->{build}{patches}, [ "SMOKEaa9ac6cf00899a6f55881d4ca6c1214215dc83ee" ], "Local patches"); diff --git a/cpan/Config-Perl-V/t/31_plv52511.t b/cpan/Config-Perl-V/t/32_plv5261rc1.t similarity index 55% copy from cpan/Config-Perl-V/t/31_plv52511.t copy to cpan/Config-Perl-V/t/32_plv5261rc1.t index b3c09cd522..9250016b7a 100644 --- a/cpan/Config-Perl-V/t/31_plv52511.t +++ b/cpan/Config-Perl-V/t/32_plv5261rc1.t @@ -5,7 +5,7 @@ use warnings; BEGIN { use Test::More; - my $tests = 125; + my $tests = 127; unless ($ENV{PERL_CORE}) { require Test::NoWarnings; Test::NoWarnings->import (); @@ -21,16 +21,16 @@ ok (my $conf = Config::Perl::V::plv2hash (<DATA>), "Read perl -v block"); ok (exists $conf->{$_}, "Has $_ entry") for qw( build environment config inc ); is ($conf->{build}{osname}, $conf->{config}{osname}, "osname"); -is ($conf->{build}{stamp}, "Feb 27 2017 15:02:41", "Build time"); -is ($conf->{config}{version}, "5.25.11", "reconstructed \$Config{version}"); +is ($conf->{build}{stamp}, "Sep 19 2017 11:20:22", "Build time"); +is ($conf->{config}{version}, "5.26.1", "reconstructed \$Config{version}"); my $opt = Config::Perl::V::plv2hash ("")->{build}{options}; foreach my $o (sort qw( DEBUGGING HAS_TIMES MULTIPLICITY PERLIO_LAYERS PERL_COPY_ON_WRITE - PERL_DONT_CREATE_GVSV PERL_TRACK_MEMPOOL PERL_IMPLICIT_CONTEXT - PERL_MALLOC_WRAP PERL_OP_PARENT PERL_PRESERVE_IVUV PERL_USE_DEVEL - USE_64_BIT_ALL - USE_64_BIT_INT USE_ITHREADS USE_LARGE_FILES USE_LOCALE USE_LOCALE_COLLATE + PERL_DONT_CREATE_GVSV PERL_OP_PARENT + PERL_TRACK_MEMPOOL PERL_IMPLICIT_CONTEXT PERL_MALLOC_WRAP + PERL_PRESERVE_IVUV USE_64_BIT_ALL USE_64_BIT_INT USE_ITHREADS + USE_LARGE_FILES USE_LOCALE USE_LOCALE_COLLATE USE_LOCALE_CTYPE USE_LOCALE_NUMERIC USE_LOCALE_TIME USE_LONG_DOUBLE USE_PERLIO USE_PERL_ATOF USE_REENTRANT_API )) { @@ -41,49 +41,53 @@ foreach my $o (sort keys %$opt) { is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); } -is_deeply ($conf->{build}{patches}, - [ "SMOKEaa9ac6cf00899a6f55881d4ca6c1214215dc83ee" ], "Local patches"); +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "dd710670fec7d2e260414648dcc94e89"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); +is ($sig, $md5, "MD5"); + +is_deeply ($conf->{build}{patches}, [ "RC1" ], "No local patches"); my %check = ( alignbytes => 16, - api_version => 25, + api_version => 26, bincompat5005 => "undef", byteorder => 12345678, - cc => "cc", + cc => "ccache cc", cccdlflags => "-fPIC", ccdlflags => "-Wl,-E", - config_args => "-des -Dusedevel -Duseithreads -Duse64bitall -Duselongdouble -DDEBUGGING", - gccversion => "6.3.1 20170202 [gcc-6-branch revision 245119]", - gnulibc_version => "2.24", + config_args => "-Duse64bitall -Duselongdouble -Dusethreads -Duseithreads -Uversiononly -Dinc_version_list=none -des", + gccversion => "4.8.3 20140627 [gcc-4_8-branch revision 212064]", + gnulibc_version => "2.19", ivsize => 8, ivtype => "long", - ld => "cc", - lddlflags => "-shared -O2 -g -L/pro/local/lib -fstack-protector-strong", - ldflags => "-L/pro/local/lib -fstack-protector-strong", - libc => "libc-2.24.so", + ld => "ccache cc", + lddlflags => "-shared -O2 -L/pro/local/lib -fstack-protector", + ldflags => "-L/pro/local/lib -fstack-protector", + libc => "libc-2.19.so", lseektype => "off_t", - osvers => "4.10.0-1-default", + osvers => "3.16.7-32-desktop", use64bitall => "define", use64bitint => "define", usemymalloc => "n", default_inc_excludes_dot - => "undef", + => "define", ); is ($conf->{config}{$_}, $check{$_}, "reconstructed \$Config{$_}") for sort keys %check; ok (my $info = summary ($conf), "A summary"); ok (exists $info->{$_}, "Summary has $_") for qw( cc config_args usemymalloc default_inc_excludes_dot ); -is ($info->{default_inc_excludes_dot}, "undef", "This build has . in INC"); +is ($info->{default_inc_excludes_dot}, "define", "This build has . in INC"); __END__ -Summary of my perl5 (revision 5 version 25 subversion 11) configuration: - Snapshot of: aa9ac6cf00899a6f55881d4ca6c1214215dc83ee +Summary of my perl5 (revision 5 version 26 subversion 1) configuration: + Platform: osname=linux - osvers=4.10.0-1-default + osvers=3.16.7-32-desktop archname=x86_64-linux-thread-multi-ld - uname='linux lx09 4.10.0-1-default #1 smp preempt mon feb 20 16:47:26 utc 2017 (81ace5a) x86_64 x86_64 x86_64 gnulinux ' - config_args='-des -Dusedevel -Duseithreads -Duse64bitall -Duselongdouble -DDEBUGGING' + uname='linux sv02 3.16.7-32-desktop #1 smp preempt wed jan 20 14:05:33 utc 2016 (d4df98a) x86_64 x86_64 x86_64 gnulinux ' + config_args='-Duse64bitall -Duselongdouble -Dusethreads -Duseithreads -Uversiononly -Dinc_version_list=none -des' hint=recommended useposix=true d_sigaction=define @@ -93,15 +97,15 @@ Summary of my perl5 (revision 5 version 25 subversion 11) configuration: use64bitall=define uselongdouble=define usemymalloc=n - default_inc_excludes_dot=undef + default_inc_excludes_dot=define bincompat5005=undef Compiler: - cc='cc' - ccflags ='-D_REENTRANT -D_GNU_SOURCE -fPIC -DDEBUGGING -fwrapv -DDEBUGGING -fno-strict-aliasing -pipe -fstack-protector-strong -I/pro/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' - optimize='-O2 -g' - cppflags='-D_REENTRANT -D_GNU_SOURCE -fPIC -DDEBUGGING -fwrapv -DDEBUGGING -fno-strict-aliasing -pipe -fstack-protector-strong -I/pro/local/include' + cc='ccache cc' + ccflags ='-D_REENTRANT -D_GNU_SOURCE -fPIC -DDEBUGGING -fwrapv -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2' + optimize='-O2' + cppflags='-D_REENTRANT -D_GNU_SOURCE -fPIC -DDEBUGGING -fwrapv -fno-strict-aliasing -pipe -fstack-protector' ccversion='' - gccversion='6.3.1 20170202 [gcc-6-branch revision 245119]' + gccversion='4.8.3 20140627 [gcc-4_8-branch revision 212064]' gccosandvers='' intsize=4 longsize=8 @@ -123,23 +127,23 @@ Summary of my perl5 (revision 5 version 25 subversion 11) configuration: alignbytes=16 prototype=define Linker and Libraries: - ld='cc' - ldflags ='-L/pro/local/lib -fstack-protector-strong' - libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/6/include-fixed /usr/lib64/gcc/x86_64-suse-linux/6/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../lib64 ... [40 chars truncated] - libs=-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat + ld='ccache cc' + ldflags ='-L/pro/local/lib -fstack-protector' + libpth=/usr/local/lib /usr/lib64/gcc/x86_64-suse-linux/4.8/include-fixed /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/lib /usr/lib /pro/local/lib /lib/../lib64 /usr/lib/../l ... [44 chars truncated] + libs=-lpthread -lnsl -ldb -ldl -lm -lcrypt -lutil -lc perllibs=-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc - libc=libc-2.24.so + libc=libc-2.19.so so=so useshrplib=false libperl=libperl.a - gnulibc_version='2.24' + gnulibc_version='2.19' Dynamic Linking: dlsrc=dl_dlopen.xs dlext=so d_dlsymun=undef ccdlflags='-Wl,-E' cccdlflags='-fPIC' - lddlflags='-shared -O2 -g -L/pro/local/lib -fstack-protector-strong' + lddlflags='-shared -O2 -L/pro/local/lib -fstack-protector' Characteristics of this binary (from libperl): @@ -155,7 +159,6 @@ Characteristics of this binary (from libperl): PERL_OP_PARENT PERL_PRESERVE_IVUV PERL_TRACK_MEMPOOL - PERL_USE_DEVEL USE_64_BIT_ALL USE_64_BIT_INT USE_ITHREADS @@ -170,13 +173,11 @@ Characteristics of this binary (from libperl): USE_PERL_ATOF USE_REENTRANT_API Locally applied patches: - SMOKEaa9ac6cf00899a6f55881d4ca6c1214215dc83ee + RC1 Built under linux - Compiled at Feb 27 2017 15:02:41 + Compiled at Sep 19 2017 11:20:22 @INC: - lib - /pro/lib/perl5/site_perl/5.25.11/x86_64-linux-thread-multi-ld - /pro/lib/perl5/site_perl/5.25.11 - /pro/lib/perl5/5.25.11/x86_64-linux-thread-multi-ld - /pro/lib/perl5/5.25.11 - . + /pro/lib/perl5/site_perl/5.26.1/x86_64-linux-thread-multi-ld + /pro/lib/perl5/site_perl/5.26.1 + /pro/lib/perl5/5.26.1/x86_64-linux-thread-multi-ld + /pro/lib/perl5/5.26.1 -- Perl5 Master Repository