47849: do not skip tests requiring zpty on Cygwin

This commit is contained in:
Jun-ichi Takimoto
2021-01-20 13:49:42 +09:00
parent bf8ca5f019
commit 6e20f0e3d1
10 changed files with 17 additions and 25 deletions

View File

@@ -1,5 +1,11 @@
2021-01-20 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 47849: Test/E01options.ztst, Test/V08zpty.ztst,
Test/W02jobs.ztst, Test/X02zlevi.ztst, Test/X03zlebindkey.ztst,
Test/X04zlehighlight.ztst, Test/Y01completion.ztst,
Test/Y02compmatch.ztst, Test/Y03arguments.ztst: do not skip
tests that require zpty on Cygwin
* Peiyuan Song: 47840: Src/Modules/zpty.c, configure.ac: make
zpty module work on Cygwin

View File

@@ -1426,9 +1426,7 @@ F:If this test fails at the first unsetopt, refer to P01privileged.ztst.
fi
0:PRIVILEGED sanity check: default value is correct
if [[ $OSTYPE == cygwin ]]; then
ZTST_skip='the zsh/zpty module does not work on Cygwin'
elif zmodload -e zsh/zpty 2>/dev/null; then
if zmodload -e zsh/zpty 2>/dev/null; then
for target_dir target_pattern in \
'.' '*' \
'/' '/*'

View File

@@ -6,8 +6,6 @@
if ! zmodload zsh/zpty 2>/dev/null
then
ZTST_unimplemented="the zsh/zpty module is not available"
elif [[ $OSTYPE = cygwin ]]; then
ZTST_unimplemented="the zsh/zpty module does not work on Cygwin"
fi
%test

View File

@@ -2,9 +2,7 @@
%prep
if [[ $OSTYPE == cygwin ]]; then
ZTST_unimplemented='the zsh/zpty module does not work on Cygwin'
elif zmodload zsh/zpty 2> /dev/null; then
if zmodload zsh/zpty 2> /dev/null; then
zpty_start() {
export PS1= PS2=
zpty -d

View File

@@ -11,9 +11,7 @@
break;
fi
done
if [[ $OSTYPE = cygwin ]]; then
ZTST_unimplemented="the zsh/zpty module does not work on Cygwin"
elif ( zmodload zsh/zpty 2>/dev/null ); then
if ( zmodload zsh/zpty 2>/dev/null ); then
. $ZTST_srcdir/comptest
comptestinit -v -z $ZTST_testdir/../Src/zsh
else

View File

@@ -12,9 +12,7 @@
break;
fi
done
if [[ $OSTYPE = cygwin ]]; then
ZTST_unimplemented="the zsh/zpty module does not work on Cygwin"
elif ( zmodload zsh/zpty 2>/dev/null ); then
if ( zmodload zsh/zpty 2>/dev/null ); then
. $ZTST_srcdir/comptest
comptestinit -z $ZTST_testdir/../Src/zsh
else

View File

@@ -5,8 +5,6 @@
export TERM=xterm-256color
if [[ ${+termcap} != 1 || ${termcap[Co]} != <-> || ${termcap[Co]} -lt 256 ]]; then
ZTST_unimplemented="no termcap module OR termcap doesn't support 256 or more colors"
elif [[ $OSTYPE == cygwin ]]; then
ZTST_unimplemented='the zsh/zpty module does not work on Cygwin'
elif zmodload zsh/zpty 2> /dev/null; then
zpty_start() {
export PS1= PS2=

View File

@@ -11,9 +11,7 @@
break;
fi
done
if [[ $OSTYPE = cygwin ]]; then
ZTST_unimplemented="the zsh/zpty module does not work on Cygwin"
elif ( zmodload zsh/zpty 2>/dev/null ); then
if ( zmodload zsh/zpty 2>/dev/null ); then
. $ZTST_srcdir/comptest
mkdir comp.tmp
cd comp.tmp
@@ -156,6 +154,9 @@ F:regression test workers/31611
>line: {tst word:/}{}
# Test for regression introduced by workers/41242, raised in workers/43842
if [[ $OSTYPE = cygwin ]]; then
ZTST_skip="\\ is equivalent to / in pathname on cygwin"
else
{
mkdir sortnobslash
touch sortnobslash/{'!foo','#foo','\foo','|foo','~foo',Afoo,bfoo}
@@ -165,6 +166,7 @@ F:regression test workers/31611
comptesteval 'LC_ALL=$old_LC_ALL'
rm -rf sortnobslash
}
fi
0:ignore backslashes when sorting completion matches
>line: {: sortnobslash/}{}
>DESCRIPTION:{file}

View File

@@ -11,9 +11,7 @@
# contains the compadd output.
%prep
if [[ $OSTYPE = cygwin ]]; then
ZTST_unimplemented="the zsh/zpty module does not work on Cygwin"
elif ( zmodload zsh/zpty 2>/dev/null ); then
if ( zmodload zsh/zpty 2>/dev/null ); then
. $ZTST_srcdir/comptest
mkdir match.tmp
cd match.tmp

View File

@@ -1,9 +1,7 @@
# Tests for _arguments.
%prep
if [[ $OSTYPE = cygwin ]]; then
ZTST_unimplemented="the zsh/zpty module does not work on Cygwin"
elif ( zmodload zsh/zpty 2>/dev/null ); then
if ( zmodload zsh/zpty 2>/dev/null ); then
. $ZTST_srcdir/comptest
mkdir comp.tmp
cd comp.tmp