In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/7c5f65bfa2908cef81917109917214fde26f0b34?hp=bea5cecf09ba646ff0ff797c17f2360066b71732>
- Log ----------------------------------------------------------------- commit 7c5f65bfa2908cef81917109917214fde26f0b34 Author: Father Chrysostomos <[email protected]> Date: Sat Jan 4 10:14:47 2014 -0800 porting/customized.t --regen M t/porting/customized.dat commit effa684c828074be726bb9c5fac18c3e4f1e746b Author: John Peacock <[email protected]> Date: Sat Jan 4 10:51:55 2014 -0500 Final patch to sync with version.pm CPAN release A last couple of test tweaks so that version.pm now passes all tests from 5.005_04 to blead. NOTE the pure Perl version::vpp is not default for all Perl releases prior to v5.10. M cpan/version/lib/version.pm M cpan/version/lib/version/vpp.pm M cpan/version/t/09_list_util.t ----------------------------------------------------------------------- Summary of changes: cpan/version/lib/version.pm | 4 +-- cpan/version/lib/version/vpp.pm | 2 +- cpan/version/t/09_list_util.t | 55 ++++++++++++++++++++++------------------- t/porting/customized.dat | 2 +- 4 files changed, 33 insertions(+), 30 deletions(-) diff --git a/cpan/version/lib/version.pm b/cpan/version/lib/version.pm index b21f1bd..dfdee5e 100644 --- a/cpan/version/lib/version.pm +++ b/cpan/version/lib/version.pm @@ -1,10 +1,10 @@ #!perl -w package version; -use 5.005_05; +use 5.005_04; use strict; -use vars qw(@ISA $VERSION $CLASS *declare *qv); +use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv); $VERSION = 0.9905; $CLASS = 'version'; diff --git a/cpan/version/lib/version/vpp.pm b/cpan/version/lib/version/vpp.pm index c879c39..79e74c3 100644 --- a/cpan/version/lib/version/vpp.pm +++ b/cpan/version/lib/version/vpp.pm @@ -117,7 +117,7 @@ sub currstr { package version::vpp; -use 5.005_05; +use 5.005_04; use strict; use POSIX qw/locale_h/; diff --git a/cpan/version/t/09_list_util.t b/cpan/version/t/09_list_util.t index f7fb89f..4882ee9 100644 --- a/cpan/version/t/09_list_util.t +++ b/cpan/version/t/09_list_util.t @@ -4,34 +4,37 @@ ######################### use strict; -use Test::More tests => 3; use_ok("version", 0.9905); +use Test::More; -# do strict lax tests in a sub to isolate a package to test importing -SKIP: { - eval "use List::Util qw(reduce);"; - skip 'No reduce() in List::Util', 2 - if $@; - - # use again to get the import() - use List::Util qw(reduce); - { - my $fail = 0; - my $ret = reduce { - version->parse($a); - $fail++ unless defined $a; - 1 - } "0.039", "0.035"; - is $fail, 0, 'reduce() with parse'; +BEGIN { + eval "use List::Util qw(reduce)"; + if ($@) { + plan skip_all => "No List::Util::reduce() available"; + } else { + plan tests => 3; } +} - { - my $fail = 0; - my $ret = reduce { - version->qv($a); - $fail++ unless defined $a; - 1 - } "0.039", "0.035"; - is $fail, 0, 'reduce() with qv'; - } +# do strict lax tests in a sub to isolate a package to test importing +# use again to get the import() +use List::Util qw(reduce); +{ + my $fail = 0; + my $ret = reduce { + version->parse($a); + $fail++ unless defined $a; + 1 + } "0.039", "0.035"; + is $fail, 0, 'reduce() with parse'; +} + +{ + my $fail = 0; + my $ret = reduce { + version->qv($a); + $fail++ unless defined $a; + 1 + } "0.039", "0.035"; + is $fail, 0, 'reduce() with qv'; } diff --git a/t/porting/customized.dat b/t/porting/customized.dat index d5c06dd..e4786e8 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -16,6 +16,6 @@ autodie cpan/autodie/t/utf8_open.t 5295851351c49f939008c5aca6a798742b1e503d libnet cpan/libnet/Makefile.PL 6b10ac98e672bfebb8f49b9720a93442645208b3 podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6 podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69 -version cpan/version/lib/version.pm 65f739f72dda1a45f497f38217883facefd0c873 +version cpan/version/lib/version.pm 881dee6f24fc887c5650b9c9a8aeed4d4923cc16 version cpan/version/t/07locale.t bbc7f94bc2ad633978aedb5732b8b4ad6b3247fb version cpan/version/t/08_corelist.t 1c10cc05162c99b02cd45f9b9fb9a310aa2bff10 -- Perl5 Master Repository
