Recent patches, plus tests

Recent patches, plus tests

[Bart Schaefer]

Since a couple of important problems have been reported since the 5.0.4
release, I'm going to go ahead and commit my last few patches so they
can go into 5.0.5 whenever PWS gets back to it.

Here's a patch to add command-position completion tests.  If we ever add
tests of specific completion functions the path assignment may need to
change or move, as it is this seems the best way to guarantee a unique
match for the prefix string.

diff --git a/Test/Y01completion.ztst b/Test/Y01completion.ztst
index 1d21c2a..906a634 100644
--- a/Test/Y01completion.ztst
+++ b/Test/Y01completion.ztst
@@ -45,7 +45,7 @@
 >line: {: ~user1}{}
 
   comptest $'echo ;:\C-b\C-b\t'
-0:tilde
+0:directories and files before separator
 >line: {echo }{;:}
 >DESCRIPTION:{file}
 >DI:{dir1}
@@ -53,6 +53,26 @@
 >FI:{file1}
 >FI:{file2}
 
+# Depends on path assignment in comptestinit
+  comptest $'zt\t'
+0:command
+>line: {ztst.zsh }{}
+
+  comptest $':;zt\t'
+0:command after separator
+>line: {:;ztst.zsh }{}
+F:regression test workers/32182
+
+  comptest $'for f in 1; do < x\C-b\C-b\t'
+0:redirection after "for ...; do"
+>line: {for f in 1; do <}{ x}
+>DESCRIPTION:{file}
+>DI:{dir1}
+>DI:{dir2}
+>FI:{file1}
+>FI:{file2}
+F:regression test workers/31611
+
 %clean
 
   zmodload -ui zsh/zpty
diff --git a/Test/comptest b/Test/comptest
index 10814d6..4fd9b27 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -30,6 +30,7 @@ comptestinit () {
 "export LC_ALL=C" \
 "emulate -R zsh" \
 "export ZDOTDIR=$ZTST_testdir" \
+"path=( $ZTST_srcdir:A )" \
 "module_path=( $module_path )" \
 "fpath=( $fpath )" \
 "bindkey -$comptest_keymap" \

Re: Recent patches, plus tests

[Jun T.]

2013/12/26 09:13, Bart Schaefer <schaefer@brasslantern.com> writes：
> --- a/Test/comptest
> +++ b/Test/comptest
> @@ -30,6 +30,7 @@ comptestinit () {
> "export LC_ALL=C" \
> "emulate -R zsh" \
> "export ZDOTDIR=$ZTST_testdir" \
> +"path=( $ZTST_srcdir:A )" \

This causes 'stty 38400 ...' to fail.


diff --git a/Test/comptest b/Test/comptest
index 4fd9b27..a34dc42 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -30,12 +30,12 @@ comptestinit () {
 "export LC_ALL=C" \
 "emulate -R zsh" \
 "export ZDOTDIR=$ZTST_testdir" \
+"stty 38400 columns 80 rows 24" \
 "path=( $ZTST_srcdir:A )" \
 "module_path=( $module_path )" \
 "fpath=( $fpath )" \
 "bindkey -$comptest_keymap" \
 'LISTMAX=10000000
-stty 38400 columns 80 rows 24
 TERM=vt100
 setopt zle
 autoload -U compinit

Re: Recent patches, plus tests

[Bart Schaefer]

On Dec 26, 11:27pm, Jun T. wrote:
}
} > +"path=( $ZTST_srcdir:A )" \
} 
} This causes 'stty 38400 ...' to fail.

Aha.  Thanks for the patch, I think I'll instead move the path= assignment
to later in the setup just to lessen the risk of similar things happening
in the future.

In fact maybe I should take it out of comptestinit entirely and put it
in the individual tests.  I waffled about that before committing ...