diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2015-05-07 22:09:43 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2015-05-08 01:22:09 +0200 |
| commit | 6b5231e48e65106022c3384a6239219f18ca176d (patch) | |
| tree | 7221dc17bcffe3763d1a3e9dca63464eb46d3954 | |
| parent | e0c83ff9cef8213e10370d188625b15c694749c2 (diff) | |
| download | zsh-6b5231e48e65106022c3384a6239219f18ca176d.tar.gz zsh-6b5231e48e65106022c3384a6239219f18ca176d.zip | |
Updated patch by pws which unsetopts PROMPT_SP
Rename patch accordingly
3 files changed, 42 insertions, 28 deletions
diff --git a/debian/patches/fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch b/debian/patches/fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch new file mode 100644 index 000000000..f289d4a0c --- /dev/null +++ b/debian/patches/fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch @@ -0,0 +1,41 @@ +Description: Fix test suite failures related to "setopt PROMPT_SP" +Author: Peter Stephenson <p.stephenson@samsung.com> +Bug: http://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=35042 +Origin: http://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=35056 + +diff --git a/Test/A02alias.ztst b/Test/A02alias.ztst +index 08163eb..cace2a4 100644 +--- a/Test/A02alias.ztst ++++ b/Test/A02alias.ztst +@@ -59,7 +59,8 @@ + >And aliases are expanded + + $ZTST_testdir/../Src/zsh -fis <<<' +- PROMPT="" ++ unsetopt PROMPT_SP ++ PROMPT="" PS2="" PS3="" PS4="" RPS1="" RPS2="" + exec 2>&1 + alias \{=echo + { begin +@@ -68,16 +69,17 @@ + 0:Aliasing reserved tokens + >begin + >end +-*>*4*{ begin +-*>*5*{end ++*>*5*{ begin ++*>*6*{end + + $ZTST_testdir/../Src/zsh -fis <<<' +- PROMPT="" ++ unsetopt PROMPT_SP ++ PROMPT="" PS2="" PS3="" PS4="" RPS1="" RPS2="" + exec 2>&1 + alias -g S=\" + echo S a string S " + fc -l -1' 2>/dev/null + 0:Global aliasing quotes + > a string S +-*>*4*echo S a string S " ++*>*5*echo S a string S " + # Note there is a trailing space on the "> a string S " line diff --git a/debian/patches/series b/debian/patches/series index fb8545e93..4342edafe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ replace-texi2html-with-makeinfo further-mitigate-test-suite-hangs.patch -test-if-test-suite-failures-are-prompt-variables-related.patch +fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch diff --git a/debian/patches/test-if-test-suite-failures-are-prompt-variables-related.patch b/debian/patches/test-if-test-suite-failures-are-prompt-variables-related.patch deleted file mode 100644 index 17e65c0a1..000000000 --- a/debian/patches/test-if-test-suite-failures-are-prompt-variables-related.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Patch to check if test suite failures are prompt variables related -Author: Peter Stephenson <p.stephenson@samsung.com> -Bug: http://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=35042 -Origin: http://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=35044 - -Index: zsh/Test/A02alias.ztst -=================================================================== ---- zsh.orig/Test/A02alias.ztst 2015-05-06 10:17:19.000000000 +0200 -+++ zsh/Test/A02alias.ztst 2015-05-06 17:48:40.000000000 +0200 -@@ -59,7 +59,7 @@ - >And aliases are expanded - - $ZTST_testdir/../Src/zsh -fis <<<' -- PROMPT="" -+ PROMPT="" PS2="" PS3="" PS4="" RPS1="" RPS2="" - exec 2>&1 - alias \{=echo - { begin -@@ -72,7 +72,7 @@ - *>*5*{end - - $ZTST_testdir/../Src/zsh -fis <<<' -- PROMPT="" -+ PROMPT="" PS2="" PS3="" PS4="" RPS1="" RPS2="" - exec 2>&1 - alias -g S=\" - echo S a string S " |