diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2004-03-11 19:14:38 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2004-03-11 19:14:38 +0000 |
| commit | 2ecaa071856fe713195be416466c2441ecff226e (patch) | |
| tree | cf258ce0cb53d0c169602cce037ddd24c70c5060 | |
| parent | d351673349fbfd2f8365ba3d8f5919370a10df63 (diff) | |
| download | zsh-2ecaa071856fe713195be416466c2441ecff226e.tar.gz zsh-2ecaa071856fe713195be416466c2441ecff226e.tar.xz zsh-2ecaa071856fe713195be416466c2441ecff226e.zip | |
19603: Gracefully omit Y tests if zpty is not available
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Test/Y01completion.ztst | 26 | ||||
| -rw-r--r-- | Test/Y02compmatch.ztst | 44 | ||||
| -rw-r--r-- | Test/Y03arguments.ztst | 22 |
4 files changed, 55 insertions, 43 deletions
diff --git a/ChangeLog b/ChangeLog index 2c5f0acf3..cdf3114dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-03-11 Peter Stephenson <pws@csr.com> + + * 19603: Test/Y01completion.ztst, Test/Y02compmatch.ztst, + Test/Y03arguments.ztst: Gracefully omit tests if zsh/zpty is + not available. + 2004-03-11 Clint Adams <clint@zsh.org> * 19600: Completion/Unix/Command/_tla: rudimentary completion diff --git a/Test/Y01completion.ztst b/Test/Y01completion.ztst index 49df8ab3a..1d21c2a33 100644 --- a/Test/Y01completion.ztst +++ b/Test/Y01completion.ztst @@ -1,18 +1,20 @@ # Tests for completion system. %prep - . $ZTST_srcdir/comptest - - mkdir comp.tmp - cd comp.tmp - - comptestinit -z $ZTST_testdir/../Src/zsh && - { - mkdir dir1 && - mkdir dir2 && - touch file1 && - touch file2 - } + if ( zmodload -i zsh/zpty ) >/dev/null 2>&1; then + . $ZTST_srcdir/comptest + mkdir comp.tmp + cd comp.tmp + comptestinit -z $ZTST_testdir/../Src/zsh && + { + mkdir dir1 && + mkdir dir2 && + touch file1 && + touch file2 + } + else + ZTST_unimplemented="the zsh/zpty module is not available" + fi %test diff --git a/Test/Y02compmatch.ztst b/Test/Y02compmatch.ztst index 4d4e0c0fa..abbe51bce 100644 --- a/Test/Y02compmatch.ztst +++ b/Test/Y02compmatch.ztst @@ -11,28 +11,30 @@ # contains the compadd output. %prep - . $ZTST_srcdir/comptest - - mkdir match.tmp - cd match.tmp - - comptestinit -z $ZTST_testdir/../Src/zsh && - { - list1=(IndianRed IndianRed2 IndianRed3 IndianRed4) - test_code () { - matcher=$1; - list=$2; - code="compdef _tst tst ; _tst () { echo -n '<COMPADD>';compadd -M '" - code="$code$matcher" - code="$code' - ${(P)list} ; echo -n '</COMPADD>'" - code="$code; $extra_cmd" - code="$code; echo -n '<INSERT_POSITIONS>'" - code="$code; echo \$compstate[insert_positions]" - code="$code; echo -n '</INSERT_POSITIONS>'" - code="$code}" - comptesteval "$code" + if ( zmodload -i zsh/zpty ) >/dev/null 2>&1; then + . $ZTST_srcdir/comptest + mkdir match.tmp + cd match.tmp + comptestinit -z $ZTST_testdir/../Src/zsh && + { + list1=(IndianRed IndianRed2 IndianRed3 IndianRed4) + test_code () { + matcher=$1; + list=$2; + code="compdef _tst tst ; _tst () { echo -n '<COMPADD>';compadd -M '" + code="$code$matcher" + code="$code' - ${(P)list} ; echo -n '</COMPADD>'" + code="$code; $extra_cmd" + code="$code; echo -n '<INSERT_POSITIONS>'" + code="$code; echo \$compstate[insert_positions]" + code="$code; echo -n '</INSERT_POSITIONS>'" + code="$code}" + comptesteval "$code" + } } - } + else + ZTST_unimplemented="the zsh/zpty module is not available" + fi %test diff --git a/Test/Y03arguments.ztst b/Test/Y03arguments.ztst index a62e34a7e..bfdcdec63 100644 --- a/Test/Y03arguments.ztst +++ b/Test/Y03arguments.ztst @@ -1,16 +1,18 @@ # Tests for _arguments. %prep - . $ZTST_srcdir/comptest - - mkdir comp.tmp - cd comp.tmp - - comptestinit -z $ZTST_testdir/../Src/zsh && - { - comptesteval 'compdef _tst tst' - tst_arguments () { comptesteval "_tst () { _arguments ${${(@qq)*}} }" } - } + if ( zmodload -i zsh/zpty ) >/dev/null 2>&1; then + . $ZTST_srcdir/comptest + mkdir comp.tmp + cd comp.tmp + comptestinit -z $ZTST_testdir/../Src/zsh && + { + comptesteval 'compdef _tst tst' + tst_arguments () { comptesteval "_tst () { _arguments ${${(@qq)*}} }" } + } + else + ZTST_unimplemented="the zsh/zpty module is not available" + fi %test tst_arguments ':desc1:(arg1)' |