diff options
Diffstat (limited to 'debian/patches')
3 files changed, 46 insertions, 0 deletions
diff --git a/debian/patches/cherry-pick-af2ab0247-attempt-to-make-output-from-interactive-test-more-robust.patch b/debian/patches/cherry-pick-af2ab0247-attempt-to-make-output-from-interactive-test-more-robust.patch new file mode 100644 index 000000000..7b13b01a5 --- /dev/null +++ b/debian/patches/cherry-pick-af2ab0247-attempt-to-make-output-from-interactive-test-more-robust.patch @@ -0,0 +1,27 @@ +Description: atttempt to make interactive param test more robust +Origin: af2ab0247265a04ac74c0ffadf8213bc1af28e41 +Author: Peter Stephenson <p.w.stephenson@ntlworld.com> + +--- a/Test/D04parameter.ztst ++++ b/Test/D04parameter.ztst +@@ -97,16 +97,17 @@ + + PROMPT="" $ZTST_testdir/../Src/zsh -fis <<<' + unsetopt PROMPT_SP +- PS2="" PS3="" PS4="" RPS1="" RPS2="" ++ PS1="" PS2="" PS3="" PS4="" RPS1="" RPS2="" ++ exec 2>&1 + foo() { + print ${1:?no arguments given} + print not reached + } + foo + print reached +- ' ++ ' 2>/dev/null + 0:interactive shell returns to top level on ${...?...} error +-?foo:1: 1: no arguments given ++*>*foo:1: 1: no arguments given + >reached + + print ${set1:+word1} ${set1+word2} ${null1:+word3} ${null1+word4} diff --git a/debian/patches/further-mitigate-test-suite-hangs.patch b/debian/patches/further-mitigate-test-suite-hangs.patch new file mode 100644 index 000000000..8c96e6996 --- /dev/null +++ b/debian/patches/further-mitigate-test-suite-hangs.patch @@ -0,0 +1,17 @@ +Origin: http://www.zsh.org/mla/workers/2014/msg01250.html +Author: Bart Schaefer <schaefer@brasslantern.com> +Bug-Debian: https://bugs.debian.org/759870 +Description: Add a sleep call which should prevent a race condition in coproc + +Index: zsh/Test/A05execution.ztst +=================================================================== +--- zsh.orig/Test/A05execution.ztst 2015-08-30 22:03:54.257198175 +0200 ++++ zsh/Test/A05execution.ztst 2015-08-30 22:03:54.257198175 +0200 +@@ -208,6 +208,7 @@ + print -u $ZTST_fd 'This test takes 5 seconds to fail...' + { printf "%d\n" {1..20000} } 2>/dev/null | ( read -e ) + hang(){ printf "%d\n" {2..20000} | cat }; hang 2>/dev/null | ( read -e ) ++ sleep 1 ;: avoid coproc exit race condition + print -p done + read -et 6 -p + 0:Bug regression: piping a shell construct to an external process may hang diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..ce4934a86 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +further-mitigate-test-suite-hangs.patch +cherry-pick-af2ab0247-attempt-to-make-output-from-interactive-test-more-robust.patch |