diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2015-08-30 22:07:18 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2015-08-30 22:07:18 +0200 |
| commit | f3aebf0bb7f9d1047079a0bea3a445458ebeb1df (patch) | |
| tree | 70b3d9b02a80650e4c4e81cc0835bacef8320496 | |
| parent | 71b9075dc16348638b3f5f70a49cd8e2566edb4c (diff) | |
| download | zsh-f3aebf0bb7f9d1047079a0bea3a445458ebeb1df.tar.gz zsh-f3aebf0bb7f9d1047079a0bea3a445458ebeb1df.zip | |
Update further-mitigate-test-suite-hangs.patch to remove additional cherry-picked fixes
| -rw-r--r-- | debian/patches/further-mitigate-test-suite-hangs.patch | 15 |
1 files 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 35b8ccad3..8c96e6996 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@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 |