summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2013-12-02 10:11:12 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2013-12-02 10:11:12 -0800
commit5a517e9cf4bee4b90bfa5155d23afc20b0b49733 (patch)
treeebb1f8978df2c54ccb9eb98ca2d689590e42aa86
parent56aa469d06a60ff23fe0c50ab9d44ae40c150412 (diff)
downloadzsh-5a517e9cf4bee4b90bfa5155d23afc20b0b49733.tar.gz
zsh-5a517e9cf4bee4b90bfa5155d23afc20b0b49733.tar.xz
zsh-5a517e9cf4bee4b90bfa5155d23afc20b0b49733.zip
32080: Suppress error output from nonessential setopt
-rw-r--r--ChangeLog5
-rw-r--r--Test/A05execution.ztst2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f2736c7f7..faafade5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-02  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 32080: Test/A05execution.ztst: suppress any error output from
+	nonessential "setopt MONITOR"
+
 2013-12-01  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted: Config/version.mk: 5.0.2-test-3.
diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst
index ba7e02cd5..61f6f5ad0 100644
--- a/Test/A05execution.ztst
+++ b/Test/A05execution.ztst
@@ -179,7 +179,7 @@
 0:Status reset by starting a backgrounded command
 >0
 
-  setopt MONITOR
+  { setopt MONITOR } 2>/dev/null
   [[ -o MONITOR ]] || print -u $ZTST_fd 'Unable to change MONITOR option'
   repeat 2048; do (return 2 |
                    return 1 |