summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2014-10-26 21:24:23 +0000
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2014-10-26 21:24:23 +0000
commit0412c0baaa8aab99dc59913614f42471091712b0 (patch)
treee8ff7ff8b7ff81d0aa45d2dc625a303833655aef
parent9a551ca85999ff329714fd2cca138ce2f7d3c3d9 (diff)
downloadzsh-0412c0baaa8aab99dc59913614f42471091712b0.tar.gz
zsh-0412c0baaa8aab99dc59913614f42471091712b0.tar.xz
zsh-0412c0baaa8aab99dc59913614f42471091712b0.zip
33564: care with monitor option in test
-rw-r--r--ChangeLog2
-rw-r--r--Test/A05execution.ztst2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fbc9d7d5..54fac61ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-10-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* 33564: Test/A05execution.ztst: more care with monitor option.
+
 	* 33542: Test/A05execution.ztst: test previous patch.
 
 	* 33531 (plus fix to test job pointer and removing
diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst
index 589815f7c..042b2d0a5 100644
--- a/Test/A05execution.ztst
+++ b/Test/A05execution.ztst
@@ -254,7 +254,7 @@ F:anonymous function, and a descriptor leak when backgrounding a pipeline
 # other words, we rely on the test working repeatedly rather than just
 # once.  The monitor option is irrelevant to the logic, so we'll make
 # our job easier by turning it off.
-  unsetopt monitor
+  { unsetopt MONITOR } 2>/dev/null
   (exit 1) &
   one=$!
   (exit 2) &