diff options
| -rw-r--r-- | debian/patches/cherry-pick-af2ab0247-attempt-to-make-output-from-interactive-test-more-robust.patch | 27 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 28 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/series b/debian/patches/series index 857f0f26d..ce4934a86 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ further-mitigate-test-suite-hangs.patch +cherry-pick-af2ab0247-attempt-to-make-output-from-interactive-test-more-robust.patch |