summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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) &