From: Jun T <takimoto-j@kba.biglobe.ne.jp>
To: zsh-workers@zsh.org
Cc: Peiyuan Song <squallatf@gmail.com>
Subject: Re: [PATCH v3] Make zpty module work in the cygwin and msys2
Date: Tue, 19 Jan 2021 17:44:51 +0900 [thread overview]
Message-ID: <6FEB1906-D455-4D9B-9E45-63897A7EAFB5@kba.biglobe.ne.jp> (raw)
In-Reply-To: <471C3A77-A559-48F9-B552-1F5C8463FD20@kba.biglobe.ne.jp>
> 2021/01/18 14:43、I wrote:
>
> Are you sure it will be fixed in 3.2.0 (and also not fixed in 3.1.x) ?
I got a reply from Peiyuan Song and it seems OK to assume this.
I will push the patch v3 unless someone finds any problem.
I will also push the patches below for the tests.
Test/E01options.ztst | 4 +---
Test/V08zpty.ztst | 2 --
Test/W02jobs.ztst | 4 +---
Test/X02zlevi.ztst | 4 +---
Test/X03zlebindkey.ztst | 4 +---
Test/X04zlehighlight.ztst | 2 --
Test/Y01completion.ztst | 8 +++++---
Test/Y02compmatch.ztst | 4 +---
Test/Y03arguments.ztst | 4 +---
9 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/Test/E01options.ztst b/Test/E01options.ztst
index 22751a5a2..415f46cd7 100644
--- a/Test/E01options.ztst
+++ b/Test/E01options.ztst
@@ -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 \
'.' '*' \
'/' '/*'
diff --git a/Test/V08zpty.ztst b/Test/V08zpty.ztst
index b0cbfa050..057db2e18 100644
--- a/Test/V08zpty.ztst
+++ b/Test/V08zpty.ztst
@@ -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
diff --git a/Test/W02jobs.ztst b/Test/W02jobs.ztst
index fe12f979d..b09f2ac62 100644
--- a/Test/W02jobs.ztst
+++ b/Test/W02jobs.ztst
@@ -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
diff --git a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst
index 4e7966e12..8146d6752 100644
--- a/Test/X02zlevi.ztst
+++ b/Test/X02zlevi.ztst
@@ -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
diff --git a/Test/X03zlebindkey.ztst b/Test/X03zlebindkey.ztst
index 298d7df5d..d643b1ec9 100644
--- a/Test/X03zlebindkey.ztst
+++ b/Test/X03zlebindkey.ztst
@@ -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
diff --git a/Test/X04zlehighlight.ztst b/Test/X04zlehighlight.ztst
index ea1d64fe1..f84c02505 100644
--- a/Test/X04zlehighlight.ztst
+++ b/Test/X04zlehighlight.ztst
@@ -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=
diff --git a/Test/Y01completion.ztst b/Test/Y01completion.ztst
index a00103946..65f341d49 100644
--- a/Test/Y01completion.ztst
+++ b/Test/Y01completion.ztst
@@ -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}
diff --git a/Test/Y02compmatch.ztst b/Test/Y02compmatch.ztst
index e2f8e1a61..621707482 100644
--- a/Test/Y02compmatch.ztst
+++ b/Test/Y02compmatch.ztst
@@ -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
diff --git a/Test/Y03arguments.ztst b/Test/Y03arguments.ztst
index a815799b3..bf41aead5 100644
--- a/Test/Y03arguments.ztst
+++ b/Test/Y03arguments.ztst
@@ -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
prev parent reply other threads:[~2021-01-19 8:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 2:28 Peiyuan Song
2021-01-18 5:43 ` Jun T
2021-01-18 7:17 ` Bart Schaefer
2021-01-18 10:56 ` Jun T
2021-01-19 8:44 ` Jun T [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6FEB1906-D455-4D9B-9E45-63897A7EAFB5@kba.biglobe.ne.jp \
--to=takimoto-j@kba.biglobe.ne.jp \
--cc=squallatf@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).