1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-06-27 12:21:00 +02:00

Assorted "make check" tweaks.

This commit is contained in:
Bart Schaefer 2001-06-25 03:06:33 +00:00
parent f0dd0ced30
commit 50f88338e6
6 changed files with 20 additions and 12 deletions

View file

@ -1,5 +1,12 @@
2001-06-24 Bart Schaefer <schaefer@zsh.org> 2001-06-24 Bart Schaefer <schaefer@zsh.org>
* 15060: Test/A02alias.ztst: Change expected return value to
account for 15050.
* 15060: Test/Y01completion.ztst, Test/Y02compmatch.ztst,
Test/Y03arguments.ztst, Test/comptest: Abandon the tests during
the %prep section if the zpty module can't be loaded.
* 15057: Src/exec.c: PRINT_EXIT_VALUE for shell functions, too. * 15057: Src/exec.c: PRINT_EXIT_VALUE for shell functions, too.
2001-06-23 Bart Schaefer <schaefer@zsh.org> 2001-06-23 Bart Schaefer <schaefer@zsh.org>

View file

@ -15,7 +15,7 @@
>echo >echo
\foo foo \foo foo
1:Not aliasing 127:Not aliasing
?ZTST_execchunk:2: command not found: foo ?ZTST_execchunk:2: command not found: foo
\bar \bar \bar \bar

View file

@ -6,12 +6,13 @@
mkdir comp.tmp mkdir comp.tmp
cd comp.tmp cd comp.tmp
comptestinit -z $ZTST_testdir/../Src/zsh comptestinit -z $ZTST_testdir/../Src/zsh &&
{
mkdir dir1 mkdir dir1
mkdir dir2 mkdir dir2
touch file1 touch file1
touch file2 touch file2
}
%test %test

View file

@ -16,10 +16,10 @@
mkdir match.tmp mkdir match.tmp
cd match.tmp cd match.tmp
comptestinit -z $ZTST_testdir/../Src/zsh comptestinit -z $ZTST_testdir/../Src/zsh &&
{
list1=(IndianRed IndianRed2 IndianRed3 IndianRed4) list1=(IndianRed IndianRed2 IndianRed3 IndianRed4)
test_code () { test_code () {
matcher=$1; matcher=$1;
list=$2; list=$2;
code="compdef _tst tst ; _tst () { echo -n '<COMPADD>';compadd -M '" code="compdef _tst tst ; _tst () { echo -n '<COMPADD>';compadd -M '"
@ -31,12 +31,10 @@
code="$code; echo -n '</INSERT_POSITIONS>'" code="$code; echo -n '</INSERT_POSITIONS>'"
code="$code}" code="$code}"
comptesteval "$code" comptesteval "$code"
}
} }
%test %test
test_code z: list1 test_code z: list1

View file

@ -6,9 +6,11 @@
mkdir comp.tmp mkdir comp.tmp
cd comp.tmp cd comp.tmp
comptestinit -z $ZTST_testdir/../Src/zsh comptestinit -z $ZTST_testdir/../Src/zsh &&
{
comptesteval 'compdef _tst tst' comptesteval 'compdef _tst tst'
tst_arguments () { comptesteval "_tst () { _arguments ${${(@qq)*}} }" } tst_arguments () { comptesteval "_tst () { _arguments ${${(@qq)*}} }" }
}
%test %test
tst_arguments ':desc1:(arg1)' tst_arguments ':desc1:(arg1)'

View file

@ -5,7 +5,7 @@ comptestinit () {
$ZTST_srcdir/../Completion $ZTST_srcdir/../Completion
$ZTST_srcdir/../Completion/*/*~*/CVS(/) ) $ZTST_srcdir/../Completion/*/*~*/CVS(/) )
zmodload -i zsh/zpty zmodload -i zsh/zpty || return $?
comptest_zsh=${ZSH:-zsh} comptest_zsh=${ZSH:-zsh}