summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-08-31 14:08:20 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2014-08-31 14:08:20 -0700
commit4d0d6e8bed8e3583aaaaf1b34c85209031c95bbb (patch)
tree4d129157583a7c99a8b1c2202adcc63e17b18fbe
parent839a72de105b1f52f8c24d25212f1721f4870d6c (diff)
downloadzsh-4d0d6e8bed8e3583aaaaf1b34c85209031c95bbb.tar.gz
zsh-4d0d6e8bed8e3583aaaaf1b34c85209031c95bbb.tar.xz
zsh-4d0d6e8bed8e3583aaaaf1b34c85209031c95bbb.zip
Further tweaking of the descriptor leak regression test that sometimes hangs
-rw-r--r--ChangeLog3
-rw-r--r--Test/A05execution.ztst8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 74a025c09..29039ffd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-08-31  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* unposted: Test/A05execution.ztst: further tweaking of the
+	descriptor leak regression test that sometimes hangs
+
 	* 33077: Src/exec.c: SHTTY = -1 when closing it in closem()
 
 2014-08-30  Barton E. Schaefer  <schaefer@zsh.org>
diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst
index 9615f091b..df6d7bc06 100644
--- a/Test/A05execution.ztst
+++ b/Test/A05execution.ztst
@@ -204,12 +204,12 @@ F:the bug is still there or it reappeared. See workers-29973 for details.
 F:This similar test was triggering a reproducible failure with pipestatus.
 
   { unsetopt MONITOR } 2>/dev/null
-  coproc { read -Et 5 || kill -INT $$ }
+  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} } | ( read -e )
+  hang(){ printf "%d\n" {2..20000} | cat }; hang | ( read -e )
   print -p done
-  read -Et 6 -p
+  read -et 6 -p
 0:Bug regression: piping a shell construct to an external process may hang
 >1
 >2