[Pkg-zsh-commits] [zsh] 03/03: Update further-mitigate-test-suite-hangs.patch to remove additional cherry-picked fixes

Axel Beckert abe at deuxchevaux.org
Sun Aug 30 20:22:07 UTC 2015


This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit f3aebf0bb7f9d1047079a0bea3a445458ebeb1df
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Aug 30 22:07:18 2015 +0200

    Update further-mitigate-test-suite-hangs.patch to remove additional cherry-picked fixes
---
 debian/patches/further-mitigate-test-suite-hangs.patch | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/debian/patches/further-mitigate-test-suite-hangs.patch b/debian/patches/further-mitigate-test-suite-hangs.patch
index 35b8cca..8c96e69 100644
--- a/debian/patches/further-mitigate-test-suite-hangs.patch
+++ b/debian/patches/further-mitigate-test-suite-hangs.patch
@@ -1,21 +1,16 @@
 Origin: http://www.zsh.org/mla/workers/2014/msg01250.html
-        http://www.zsh.org/mla/workers/2015/msg02205.html
 Author: Bart Schaefer <schaefer at brasslantern.com>
 Bug-Debian: https://bugs.debian.org/759870
 Description: Add a sleep call which should prevent a race condition in coproc
 
 Index: zsh/Test/A05execution.ztst
 ===================================================================
---- zsh.orig/Test/A05execution.ztst	2015-08-27 15:48:53.624802242 +0200
-+++ zsh/Test/A05execution.ztst	2015-08-27 15:48:53.616802043 +0200
-@@ -206,8 +206,9 @@
-   { unsetopt MONITOR } 2>/dev/null
-   coproc { read -et 5 || { print -u $ZTST_fd KILLED; kill -HUP -$$ } }
+--- zsh.orig/Test/A05execution.ztst	2015-08-30 22:03:54.257198175 +0200
++++ zsh/Test/A05execution.ztst	2015-08-30 22:03:54.257198175 +0200
+@@ -208,6 +208,7 @@
    print -u $ZTST_fd 'This test takes 5 seconds to fail...'
--  { printf "%d\n" {1..20000} } | ( read -e )
--  hang(){ printf "%d\n" {2..20000} | cat }; hang | ( read -e )
-+  { printf "%d\n" {1..20000} } 2>/dev/null | ( read -e )
-+  hang(){ printf "%d\n" {2..20000} | cat }; hang 2>/dev/null | ( read -e )
+   { printf "%d\n" {1..20000} } 2>/dev/null | ( read -e )
+   hang(){ printf "%d\n" {2..20000} | cat }; hang 2>/dev/null | ( read -e )
 +  sleep 1 ;: avoid coproc exit race condition
    print -p done
    read -et 6 -p

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git



More information about the Pkg-zsh-commits mailing list