summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2013-12-02 18:58:28 +0100
committerAxel Beckert <abe@deuxchevaux.org>2013-12-02 18:58:28 +0100
commit04b8f147ca94c1a9698cc1b9f7ebb95c89df957b (patch)
tree4c3af5abfa1d0ca8987697ec545902f3b6babe25
parent1e707e44bb308f01630ba0b52df9afc8ad678508 (diff)
downloadzsh-04b8f147ca94c1a9698cc1b9f7ebb95c89df957b.tar.gz
zsh-04b8f147ca94c1a9698cc1b9f7ebb95c89df957b.zip
Add patch which hopefully fixes test suite failures on Jenkins builds
-rw-r--r--debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch16
-rw-r--r--debian/patches/series1
2 files changed, 17 insertions, 0 deletions
diff --git a/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch b/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch
new file mode 100644
index 000000000..4e4f1a9b1
--- /dev/null
+++ b/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch
@@ -0,0 +1,16 @@
+Description: Make A05execution.ztst not fail if setopt MONITOR fails
+Author: Bart E. Schaefer <schaefer@brasslantern.com>
+
+diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst
+index ba7e02c..61f6f5a 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 |
diff --git a/debian/patches/series b/debian/patches/series
index 2268b4303..e1df562db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
replace-texi2html-with-makeinfo
use-dev-null-instead-of-dev-tty-for-dash-c-test.patch
+fix-A05execution-ztst-setopt-MONITOR.patch