summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2013-12-26 16:04:30 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2013-12-26 16:04:30 -0800
commit083328e697ba4251520c8fa42fe386174c5a41e5 (patch)
treedf30a55182acff4fa1d5eb0245c1d34581259893
parentd83faa9d9955b6b449a91e16700155b144c56a50 (diff)
downloadzsh-083328e697ba4251520c8fa42fe386174c5a41e5.tar.gz
zsh-083328e697ba4251520c8fa42fe386174c5a41e5.zip
unposted: move path assignment from comptest to Y01completion.ztst
-rw-r--r--ChangeLog6
-rw-r--r--Test/Y01completion.ztst2
-rw-r--r--Test/comptest1
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c1b6a8543..e7bd54f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-26 Barton E. Schaefer <schaefer@zsh.org>
+
+ * unposted (cf. Jun Takimoto: 32184): Test/comptest,
+ Test/Y01completion.ztst: back 32183 out of comptest and instead
+ reset path in the individual tests in Y01completion.ztst
+
2013-12-25 Barton E. Schaefer <schaefer@zsh.org>
* 32183: Test/comptest, Test/Y01completion.ztst: regression tests
diff --git a/Test/Y01completion.ztst b/Test/Y01completion.ztst
index 906a634de..a2aa00717 100644
--- a/Test/Y01completion.ztst
+++ b/Test/Y01completion.ztst
@@ -54,10 +54,12 @@
>FI:{file2}
# Depends on path assignment in comptestinit
+ comptesteval "path=( $ZTST_srcdir:A )"
comptest $'zt\t'
0:command
>line: {ztst.zsh }{}
+ comptesteval "path=( $ZTST_srcdir:A )"
comptest $':;zt\t'
0:command after separator
>line: {:;ztst.zsh }{}
diff --git a/Test/comptest b/Test/comptest
index 4fd9b272d..10814d635 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -30,7 +30,6 @@ 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" \