summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Test/A05execution.ztst2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c2f4952be..a0311ba9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-26  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 36282: Test/A05execution.ztst: discard stderr of "hang" test
+
 2015-08-25  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted: Config/version.mk: 5.0.8-test-3.
diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst
index d5501bb33..d9e640954 100644
--- a/Test/A05execution.ztst
+++ b/Test/A05execution.ztst
@@ -207,7 +207,7 @@ F:This similar test was triggering a reproducible failure with pipestatus.
   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 )
+  hang(){ printf "%d\n" {2..20000} | cat }; hang 2>/dev/null | ( read -e )
   print -p done
   read -et 6 -p
 0:Bug regression: piping a shell construct to an external process may hang