From 455f8519b217837f67f33d2f70c817fdecd43be3 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Wed, 14 Jan 2015 14:24:01 +0000 Subject: 34275: assume zpty can't be used for testing Cygwin --- ChangeLog | 6 ++++++ Test/V08zpty.ztst | 3 ++- Test/Y01completion.ztst | 4 +++- Test/Y02compmatch.ztst | 4 +++- Test/Y03arguments.ztst | 4 +++- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a95824fd..3388f89c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-01-14 Peter Stephenson + + * 34275: Test/V08zpty.ztst, Test/Y01completion.ztst, + Test/Y02compmatch.ztst, Test/Y03arguments.ztst: assume zpty + doesn't work under Cygwin. + 2015-01-13 Barton E. Schaefer * 34273: Doc/Zsh/compsys.yo: use a sufficient number of colons diff --git a/Test/V08zpty.ztst b/Test/V08zpty.ztst index 5b08fc281..b0cbfa050 100644 --- a/Test/V08zpty.ztst +++ b/Test/V08zpty.ztst @@ -6,7 +6,8 @@ if ! zmodload zsh/zpty 2>/dev/null then ZTST_unimplemented="the zsh/zpty module is not available" - return 0 + elif [[ $OSTYPE = cygwin ]]; then + ZTST_unimplemented="the zsh/zpty module does not work on Cygwin" fi %test diff --git a/Test/Y01completion.ztst b/Test/Y01completion.ztst index a2aa00717..383e6529f 100644 --- a/Test/Y01completion.ztst +++ b/Test/Y01completion.ztst @@ -1,7 +1,9 @@ # Tests for completion system. %prep - if ( zmodload -i zsh/zpty ) >/dev/null 2>&1; then + if [[ $OSTYPE = cygwin ]]; then + ZTST_unimplemented="the zsh/zpty module does not work on Cygwin" + elif ( zmodload -i zsh/zpty ) >/dev/null 2>&1; then . $ZTST_srcdir/comptest mkdir comp.tmp cd comp.tmp diff --git a/Test/Y02compmatch.ztst b/Test/Y02compmatch.ztst index 704580043..db734facc 100644 --- a/Test/Y02compmatch.ztst +++ b/Test/Y02compmatch.ztst @@ -11,7 +11,9 @@ # contains the compadd output. %prep - if ( zmodload -i zsh/zpty ) >/dev/null 2>&1; then + if [[ $OSTYPE = cygwin ]]; then + ZTST_unimplemented="the zsh/zpty module does not work on Cygwin" + elif ( zmodload -i zsh/zpty ) >/dev/null 2>&1; then . $ZTST_srcdir/comptest mkdir match.tmp cd match.tmp diff --git a/Test/Y03arguments.ztst b/Test/Y03arguments.ztst index bfdcdec63..0627104f5 100644 --- a/Test/Y03arguments.ztst +++ b/Test/Y03arguments.ztst @@ -1,7 +1,9 @@ # Tests for _arguments. %prep - if ( zmodload -i zsh/zpty ) >/dev/null 2>&1; then + if [[ $OSTYPE = cygwin ]]; then + ZTST_unimplemented="the zsh/zpty module does not work on Cygwin" + elif ( zmodload -i zsh/zpty ) >/dev/null 2>&1; then . $ZTST_srcdir/comptest mkdir comp.tmp cd comp.tmp -- cgit 1.4.1