[Pkg-zsh-commits] [zsh] 01/01: Throw away even more errors in further-mitigate-test-suite-hangs.patch

[Axel Beckert]

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

abe pushed a commit to branch debian
in repository zsh.

commit 5c3b312cdeac0ae3f3f6b71f3dbc69bf18000d88
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Aug 27 15:50:04 2015 +0200

    Throw away even more errors in further-mitigate-test-suite-hangs.patch
---
 Test/A05execution.ztst                                 |  5 +++--
 debian/patches/further-mitigate-test-suite-hangs.patch | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst
index d5501bb..a12ba46 100644
--- a/Test/A05execution.ztst
+++ b/Test/A05execution.ztst
@@ -206,8 +206,9 @@ F:This similar test was triggering a reproducible failure with pipestatus.
   { unsetopt MONITOR } 2>/dev/null
   coproc { read -et 5 || { print -u $ZTST_fd KILLED; kill -HUP -$$ } }
   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 )
+  sleep 1 ;: avoid coproc exit race condition
   print -p done
   read -et 6 -p
 0:Bug regression: piping a shell construct to an external process may hang
diff --git a/debian/patches/further-mitigate-test-suite-hangs.patch b/debian/patches/further-mitigate-test-suite-hangs.patch
index 5fc4ebd..35b8cca 100644
--- a/debian/patches/further-mitigate-test-suite-hangs.patch
+++ b/debian/patches/further-mitigate-test-suite-hangs.patch
@@ -6,13 +6,15 @@ 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-26 23:00:54.942370669 +0200
-+++ zsh/Test/A05execution.ztst	2015-08-26 23:09:35.562131142 +0200
-@@ -207,7 +207,8 @@
+--- 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 -$$ } }
    print -u $ZTST_fd 'This test takes 5 seconds to fail...'
-   { printf "%d\n" {1..20000} } | ( read -e )
+-  { 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 )
 +  sleep 1 ;: avoid coproc exit race condition
    print -p done

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