This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libzmq-ffi-perl.
commit a4456a6f1944037873ad9e9f459eabd3a560c371 Author: gregor herrmann <gre...@debian.org> Date: Fri Sep 16 21:51:44 2016 +0200 Add patch from upstream Git to fix occasional hangs in t/proxy.t. Closes: #835412 --- debian/patches/fix_t_proxy.patch | 50 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 51 insertions(+) diff --git a/debian/patches/fix_t_proxy.patch b/debian/patches/fix_t_proxy.patch new file mode 100644 index 0000000..664af03 --- /dev/null +++ b/debian/patches/fix_t_proxy.patch @@ -0,0 +1,50 @@ +From 67820116377f2cbd94992504751745db5366ff7b Mon Sep 17 00:00:00 2001 +From: Dylan Cali <calid1...@gmail.com> +Date: Fri, 16 Sep 2016 15:13:17 -0400 +Subject: [PATCH] fix t/proxy.t hang + +Bug: https://github.com/calid/zmq-ffi/issues/37 +Bug-Debian: https://bugs.debian.org/835412 + +--- + t/proxy.t | 18 +++--------------- + 1 file changed, 3 insertions(+), 15 deletions(-) + +diff --git a/t/proxy.t b/t/proxy.t +index bd000d2..50f3821 100644 +--- a/t/proxy.t ++++ b/t/proxy.t +@@ -17,9 +17,6 @@ my $proxy = fork; + die "fork failed: $!" unless defined $proxy; + + if ( $proxy == 0 ) { +- # make sure child shuts down cleanly +- $SIG{TERM} = sub { exit 0 }; +- + my $ctx = ZMQ::FFI->new(); + + my $front = $ctx->socket(ZMQ_PULL); +@@ -54,20 +51,11 @@ subtest 'proxy', sub { + + my $payload = $worker->recv; + is $payload, $message, "Message received"; +-}; +- +-# tear down the proxy +-do { +- # XXX +- # Occasionally the TERM signal handler does not actually fire, even +- # though kill returns 1 (indicating the child was successfully signaled). +- # As a result waitpid blocks, hanging the test. +- # +- # As a workaround until the problem is understood, check waitpid in a loop +- # and kill until the process actually exits + + kill TERM => $proxy; +-} while (waitpid($proxy, WNOHANG) > 0); ++ waitpid($proxy,0); ++}; ++ + + done_testing; + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..441a409 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix_t_proxy.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libzmq-ffi-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits