This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libtest-simple-perl.
commit 9d3f1f2f96143cec9935cad32d56112fcbae3ef9 Author: gregor herrmann <[email protected]> Date: Tue Oct 3 23:01:42 2017 +0200 Drop 0001-Reset-inside-subtest-maintains-parent.patch which was cherry-picked from upstream Git. --- ...001-Reset-inside-subtest-maintains-parent.patch | 71 ---------------------- debian/patches/series | 1 - 2 files changed, 72 deletions(-) diff --git a/debian/patches/0001-Reset-inside-subtest-maintains-parent.patch b/debian/patches/0001-Reset-inside-subtest-maintains-parent.patch deleted file mode 100644 index af42ac3..0000000 --- a/debian/patches/0001-Reset-inside-subtest-maintains-parent.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 68775db7eef1a7e30dc03abf8feabcf3e32301d4 Mon Sep 17 00:00:00 2001 -From: Chad Granum <[email protected]> -Date: Wed, 1 Feb 2017 19:33:57 -0800 -Subject: [PATCH] Reset inside subtest maintains parent - -When TB->reset is called from within a subtest it should maintain the -link to the parent, this link is necessary for unwinding the TB-stack. - -Fixes #757 - -Origin: upstream, https://github.com/Test-More/test-more/commit/68775db7eef1a7e30dc03abf8feabcf3e32301d4 -Bug-Debian: https://bugs.debian.org/865893 -Bug: https://github.com/Test-More/test-more/issues/757 - ---- - lib/Test/Builder.pm | 4 +++- - t/regression/757-reset_in_subtest.t | 20 ++++++++++++++++++++ - 2 files changed, 23 insertions(+), 1 deletion(-) - create mode 100644 t/regression/757-reset_in_subtest.t - -diff --git a/lib/Test/Builder.pm b/lib/Test/Builder.pm -index c0eaf1a7..7960787e 100644 ---- a/lib/Test/Builder.pm -+++ b/lib/Test/Builder.pm -@@ -143,7 +143,8 @@ sub parent { - my $chub = $self->{Hub} || $ctx->hub; - $ctx->release; - -- my $parent = $chub->meta(__PACKAGE__, {})->{parent}; -+ my $meta = $chub->meta(__PACKAGE__, {}); -+ my $parent = $meta->{parent}; - - return undef unless $parent; - -@@ -388,6 +389,7 @@ sub reset { ## no critic (Subroutines::ProhibitBuiltinHomonyms) - Done_Testing => undef, - Skip_All => 0, - Test_Results => [], -+ parent => $meta->{parent}, - ); - - $self->{Exported_To} = undef; -diff --git a/t/regression/757-reset_in_subtest.t b/t/regression/757-reset_in_subtest.t -new file mode 100644 -index 00000000..846a34d8 ---- /dev/null -+++ b/t/regression/757-reset_in_subtest.t -@@ -0,0 +1,20 @@ -+use strict; -+use warnings; -+ -+use Test::More; -+ -+subtest 'subtest' => sub { -+ Test::Builder->new->reset; -+ ok 1; -+}; -+ -+subtest 'subtest' => sub { -+ Test::Builder->new->reset; -+ subtest 'subtest' => sub { -+ Test::Builder->new->reset; -+ ok 1; -+ }; -+ ok 1; -+}; -+ -+done_testing; --- -2.13.2 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 58cde77..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Reset-inside-subtest-maintains-parent.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtest-simple-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
