In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/35c5736572cfe7a326c2bcdd39a98c514d54d038?hp=bd9cbc460bc6144f7e4cfc82772b389efe6331e3>
- Log ----------------------------------------------------------------- commit 35c5736572cfe7a326c2bcdd39a98c514d54d038 Author: John Peacock <[email protected]> Date: Wed Mar 28 22:22:22 2012 -0400 Test patch for version 0.97 I had some isolated test failures with 0.96 from BSDish systems with limited locales installed. The attached patch brings bleadperl in line with the CPAN 0.97 release. I'd like to see it get into 5.16 if possible, so that we don't have needless test failures. Thanks John Signed-off-by: Chris 'BinGOs' Williams <[email protected]> ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- lib/version.pm | 2 +- lib/version/t/01base.t | 2 +- lib/version/t/02derived.t | 2 +- lib/version/t/03require.t | 2 +- lib/version/t/05sigdie.t | 2 +- lib/version/t/06noop.t | 2 +- lib/version/t/07locale.t | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 97c5545..bef1e74 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1974,7 +1974,7 @@ use File::Glob qw(:case); 'version' => { 'MAINTAINER' => 'jpeacock', - 'DISTRIBUTION' => 'JPEACOCK/version-0.96.tar.gz', + 'DISTRIBUTION' => 'JPEACOCK/version-0.97.tar.gz', 'FILES' => q[lib/version.pm lib/version.pod lib/version], 'EXCLUDED' => [ qr{^t/.*\.t$}, diff --git a/lib/version.pm b/lib/version.pm index 65407e8..3d3af10 100644 --- a/lib/version.pm +++ b/lib/version.pm @@ -6,7 +6,7 @@ use strict; use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv); -$VERSION = 0.96; +$VERSION = 0.97; $CLASS = 'version'; diff --git a/lib/version/t/01base.t b/lib/version/t/01base.t index f6d277f..f5784cd 100644 --- a/lib/version/t/01base.t +++ b/lib/version/t/01base.t @@ -9,7 +9,7 @@ use Test::More qw/no_plan/; BEGIN { (my $coretests = $0) =~ s'[^/]+\.t'coretests.pm'; require $coretests; - use_ok('version', 0.96); + use_ok('version', 0.97); } diag "Tests with base class" unless $ENV{PERL_CORE}; diff --git a/lib/version/t/02derived.t b/lib/version/t/02derived.t index 8ff4c17..3ea847e 100644 --- a/lib/version/t/02derived.t +++ b/lib/version/t/02derived.t @@ -10,7 +10,7 @@ use File::Temp qw/tempfile/; BEGIN { (my $coretests = $0) =~ s'[^/]+\.t'coretests.pm'; require $coretests; - use_ok("version", 0.96); + use_ok("version", 0.97); # If we made it this far, we are ok. } diff --git a/lib/version/t/03require.t b/lib/version/t/03require.t index b137674..0d0755c 100644 --- a/lib/version/t/03require.t +++ b/lib/version/t/03require.t @@ -14,7 +14,7 @@ BEGIN { # Don't want to use, because we need to make sure that the import doesn't # fire just yet (some code does this to avoid importing qv() and delare()). require_ok("version"); -is $version::VERSION, 0.96, "Make sure we have the correct class"; +is $version::VERSION, 0.97, "Make sure we have the correct class"; ok(!"main"->can("qv"), "We don't have the imported qv()"); ok(!"main"->can("declare"), "We don't have the imported declare()"); diff --git a/lib/version/t/05sigdie.t b/lib/version/t/05sigdie.t index 190fc90..2a33339 100644 --- a/lib/version/t/05sigdie.t +++ b/lib/version/t/05sigdie.t @@ -15,7 +15,7 @@ BEGIN { BEGIN { - use version 0.96; + use version 0.97; } pass "Didn't get caught by the wrong DIE handler, which is a good thing"; diff --git a/lib/version/t/06noop.t b/lib/version/t/06noop.t index c3915e4..63f7073 100644 --- a/lib/version/t/06noop.t +++ b/lib/version/t/06noop.t @@ -7,7 +7,7 @@ use Test::More qw/no_plan/; BEGIN { - use_ok('version', 0.96); + use_ok('version', 0.97); } my $v1 = version->new('1.2'); diff --git a/lib/version/t/07locale.t b/lib/version/t/07locale.t index e5b0a81..506b1bf 100644 --- a/lib/version/t/07locale.t +++ b/lib/version/t/07locale.t @@ -10,11 +10,11 @@ use POSIX qw/locale_h/; use Test::More tests => 7; BEGIN { - use_ok('version', 0.96); + use_ok('version', 0.97); } SKIP: { - skip 'No locale testing for Perl < 5.6.0', 6 if $] < 5.006; + skip 'No locale testing for Perl < 5.6.0', 6 if $] < 5.006; # test locale handling my $warning; local $SIG{__WARN__} = sub { $warning = $_[0] }; @@ -29,7 +29,7 @@ SKIP: { last if localeconv()->{decimal_point} eq ','; } skip 'Cannot test locale handling without a comma locale', 5 - unless $loc; + unless $loc and localeconv()->{decimal_point} eq ','; diag ("Testing locale handling with $loc") unless $ENV{PERL_CORE}; -- Perl5 Master Repository
