In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/af81008fa354eb767b7c3b682238c3e0f5b170ef?hp=2d05221bbd5b0257cf58fea01dd832fbc382b355>
- Log ----------------------------------------------------------------- commit af81008fa354eb767b7c3b682238c3e0f5b170ef Author: Chad Granum <[email protected]> Date: Sat Dec 13 22:44:32 2014 -0800 Test-Simple Version Bump, 1.301001_088 (RC8) ----------------------------------------------------------------------- Summary of changes: cpan/Test-Simple/lib/Test/Builder.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Module.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Tester.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm | 2 +- cpan/Test-Simple/lib/Test/More.pm | 2 +- cpan/Test-Simple/lib/Test/Simple.pm | 4 ++-- cpan/Test-Simple/lib/Test/Stream.pm | 9 +++------ cpan/Test-Simple/lib/Test/Stream/ExitMagic.pm | 9 ++++++++- cpan/Test-Simple/lib/Test/Tester.pm | 2 +- cpan/Test-Simple/lib/Test/use/ok.pm | 2 +- cpan/Test-Simple/lib/ok.pm | 2 +- 11 files changed, 21 insertions(+), 17 deletions(-) diff --git a/cpan/Test-Simple/lib/Test/Builder.pm b/cpan/Test-Simple/lib/Test/Builder.pm index b2ccd47..d3f13dc 100644 --- a/cpan/Test-Simple/lib/Test/Builder.pm +++ b/cpan/Test-Simple/lib/Test/Builder.pm @@ -4,7 +4,7 @@ use 5.008001; use strict; use warnings; -our $VERSION = '1.301001_087'; +our $VERSION = '1.301001_088'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) diff --git a/cpan/Test-Simple/lib/Test/Builder/Module.pm b/cpan/Test-Simple/lib/Test/Builder/Module.pm index 22c8c59..0ea754d 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Module.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Module.pm @@ -8,7 +8,7 @@ use Test::Builder 0.99; require Exporter; our @ISA = qw(Exporter); -our $VERSION = '1.301001_087'; +our $VERSION = '1.301001_088'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester.pm b/cpan/Test-Simple/lib/Test/Builder/Tester.pm index 7edfe54..b26cffe 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Tester.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Tester.pm @@ -1,7 +1,7 @@ package Test::Builder::Tester; use strict; -our $VERSION = '1.301001_087'; +our $VERSION = '1.301001_088'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::Stream 1.301001 '-internal'; diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm index 84df56e..7725dc3 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm @@ -1,7 +1,7 @@ package Test::Builder::Tester::Color; use strict; -our $VERSION = '1.301001_087'; +our $VERSION = '1.301001_088'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::Stream 1.301001 '-internal'; diff --git a/cpan/Test-Simple/lib/Test/More.pm b/cpan/Test-Simple/lib/Test/More.pm index 70124d9..ad96dc9 100644 --- a/cpan/Test-Simple/lib/Test/More.pm +++ b/cpan/Test-Simple/lib/Test/More.pm @@ -4,7 +4,7 @@ use 5.008001; use strict; use warnings; -our $VERSION = '1.301001_087'; +our $VERSION = '1.301001_088'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::Stream 1.301001 '-internal'; diff --git a/cpan/Test-Simple/lib/Test/Simple.pm b/cpan/Test-Simple/lib/Test/Simple.pm index 9f3b2a2..475638e 100644 --- a/cpan/Test-Simple/lib/Test/Simple.pm +++ b/cpan/Test-Simple/lib/Test/Simple.pm @@ -5,10 +5,10 @@ use 5.008001; use strict; use warnings; -our $VERSION = '1.301001_087'; +our $VERSION = '1.301001_088'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) -use Test::Stream 1.301001_087 '-internal'; +use Test::Stream 1.301001_088 '-internal'; use Test::Stream::Toolset; use Test::Stream::Exporter; diff --git a/cpan/Test-Simple/lib/Test/Stream.pm b/cpan/Test-Simple/lib/Test/Stream.pm index 762fcaa..a6691b7 100644 --- a/cpan/Test-Simple/lib/Test/Stream.pm +++ b/cpan/Test-Simple/lib/Test/Stream.pm @@ -2,7 +2,7 @@ package Test::Stream; use strict; use warnings; -our $VERSION = '1.301001_087'; +our $VERSION = '1.301001_088'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::Stream::Context qw/context/; @@ -389,7 +389,8 @@ sub done_testing { return; } - if ($self->[FOLLOW_UPS]) { + # Do not run followups in subtest! + if ($self->[FOLLOW_UPS] && !@{$self->[SUBTESTS]}) { $_->($ctx) for @{$self->[FOLLOW_UPS]}; } @@ -488,10 +489,6 @@ sub _update_state { } } elsif (!$self->[NO_HEADER] && $e->isa('Test::Stream::Event::Finish')) { - if ($self->[FOLLOW_UPS]) { - $_->($e->context) for @{$self->[FOLLOW_UPS]}; - } - $state->[STATE_ENDED] = $e->context->snapshot; my $plan = $state->[STATE_PLAN]; diff --git a/cpan/Test-Simple/lib/Test/Stream/ExitMagic.pm b/cpan/Test-Simple/lib/Test/Stream/ExitMagic.pm index 2294d01..7f5bf5b 100644 --- a/cpan/Test-Simple/lib/Test/Stream/ExitMagic.pm +++ b/cpan/Test-Simple/lib/Test/Stream/ExitMagic.pm @@ -28,11 +28,18 @@ sub do_magic { my $real_exit_code = $?; + $context ||= Test::Stream::ExitMagic::Context->new([caller()], $stream); + + if (!$stream->ended && $stream->follow_ups && @{$stream->follow_ups}) { + $context->set; + $_->($context) for @{$stream->follow_ups}; + $context->clear; + } + my $plan = $stream->plan; my $total = $stream->count; my $fails = $stream->failed; - $context ||= Test::Stream::ExitMagic::Context->new([caller()], $stream); $context->finish($total, $fails); # Ran tests but never declared a plan or hit done_testing diff --git a/cpan/Test-Simple/lib/Test/Tester.pm b/cpan/Test-Simple/lib/Test/Tester.pm index dc0dbd3..cd11226 100644 --- a/cpan/Test-Simple/lib/Test/Tester.pm +++ b/cpan/Test-Simple/lib/Test/Tester.pm @@ -16,7 +16,7 @@ require Exporter; use vars qw( @ISA @EXPORT $VERSION ); -our $VERSION = '1.301001_087'; +our $VERSION = '1.301001_088'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) @EXPORT = qw( run_tests check_tests check_test cmp_results show_space ); diff --git a/cpan/Test-Simple/lib/Test/use/ok.pm b/cpan/Test-Simple/lib/Test/use/ok.pm index e4f037c..1283064 100644 --- a/cpan/Test-Simple/lib/Test/use/ok.pm +++ b/cpan/Test-Simple/lib/Test/use/ok.pm @@ -3,7 +3,7 @@ use strict; use warnings; use 5.005; -our $VERSION = '1.301001_087'; +our $VERSION = '1.301001_088'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::Stream 1.301001 '-internal'; diff --git a/cpan/Test-Simple/lib/ok.pm b/cpan/Test-Simple/lib/ok.pm index 7ab7abc..7fb066e 100644 --- a/cpan/Test-Simple/lib/ok.pm +++ b/cpan/Test-Simple/lib/ok.pm @@ -6,7 +6,7 @@ use Test::Stream 1.301001 '-internal'; use Test::More 1.301001 (); use Test::Stream::Carp qw/croak/; -our $VERSION = '1.301001_087'; +our $VERSION = '1.301001_088'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) sub import { -- Perl5 Master Repository
