summaryrefslogtreecommitdiff
path: root/debian/patches/fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2015-05-07 22:09:43 +0200
committerAxel Beckert <abe@deuxchevaux.org>2015-05-08 01:22:09 +0200
commit6b5231e48e65106022c3384a6239219f18ca176d (patch)
tree7221dc17bcffe3763d1a3e9dca63464eb46d3954 /debian/patches/fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch
parente0c83ff9cef8213e10370d188625b15c694749c2 (diff)
downloadzsh-6b5231e48e65106022c3384a6239219f18ca176d.tar.gz
zsh-6b5231e48e65106022c3384a6239219f18ca176d.zip
Updated patch by pws which unsetopts PROMPT_SP
Rename patch accordingly
Diffstat (limited to 'debian/patches/fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch')
-rw-r--r--debian/patches/fix-test-suite-failures-related-to-setopt-PROMPT_SP.patch41
1 files changed, 41 insertions, 0 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