From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 23098 invoked from network); 19 Jan 2021 08:45:24 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 19 Jan 2021 08:45:24 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20200801; t=1611045924; b=0KbhC2J+Rgl/+2V9cf7fPhHFosjBt1RxAAZp6kCiMOUQCA89f93mowElYP8qBxeZUdlWu1tmGQ J3z7Efw4S5AVDR/q0fdYeTH1CJzURv8+r/hteTSYLAdcG8dVjO5U1tdE+KQ2cxYU7e3IMhKNBJ Nem8Ef83ayoss+d7NmGdPKXPy2i1NauuPR8Z5d2lvmvNrEvscnTn6hTmkIDeeyGg5E3kxJ37rc YhlOC63LcDE4FSZFsi/Et0pk9TNtGnZhqbmWnIaGScEXq1+pODT3qyyib46wZbJGp56pewbuWm plsTpG/S3X+h+yhxRyZkSxtZRys3aiMKjpdYBzp6vn/eOg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (rcpt-expgw.biglobe.ne.jp) smtp.remote-ip=133.208.98.3; dmarc=none header.from=kba.biglobe.ne.jp; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20200801; t=1611045924; bh=XQl9HDrv8TOBajmLoiG8uexjTE9+yfEPsvQ40KRqfpI=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:To:References:Message-ID:Content-Transfer-Encoding:Cc:Date: In-Reply-To:From:Subject:MIME-Version:Content-Type:DKIM-Signature; b=t4ipITFSa/chjMEtC09udseCE1ssUpnKcHU5eElRnTlKHufV6S3fbjlgkrq1F4A+AzBWeGWP9O jWsAGnd3R+p0a5Oi8kEAfrmqJDH61Z6r+p870bgVmVWd+kLlAwOHd1dWLbfWNSX7Hv4vCSB2C2 q9dlGz5976AdOQOr/Dm084mhsUzCYVPgUBEXoh9rLd2mvNQ44rztosZMCHjtsMWx2Tr6pH/GNq CCPor3lRBwZBWYCV9B6/ywBFxOsRUnZM5yr0SODncIVYERIq7nAMavLoKVjGpKXWjcz0VZvWg7 dQdcn1zBsH7gMTRW7IoqHsUszCgs9/wz/OQiQO+XjHy75g==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:To:References:Message-Id: Content-Transfer-Encoding:Cc:Date:In-Reply-To:From:Subject:Mime-Version: Content-Type:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=9alfxiCmUySt1RNLLdKuqNsyNlsPnN5PDPXvPKWRLz8=; b=sweuaI7GLOdJxlnL4ThX8Ftrw6 E7/9deQGZPoKfvVqnmyzOrQSLXsRfiuO2RVPR7aWliM7zcIIkbgNsrA+wN99qb2fTFcRS4CcBOwBd 4/rWdRndOTvlWeSmZhYfFF4R9ShJVVMNuJILJOHJ0CZu3Gan15K79SONAJP4PZ/QyZkghOiV5dv/q qqKEqD4nPi6vnW7kNanUepUJkBY1eQ3HOlRxILUr130Ee0TQNNw7mjm0EH44xEnLOn7x6keviLSR/ plUSEl0iypbTeXbA8rQam6WskcEFc2nVOORdsHsmXhxxJJI6tI+8+/zn1ThLAt4TLY8vrnf30R53X YVvvfH0g==; Received: from authenticated user by zero.zsh.org with local id 1l1mde-000Fkz-6C; Tue, 19 Jan 2021 08:45:22 +0000 Authentication-Results: zsh.org; iprev=pass (rcpt-expgw.biglobe.ne.jp) smtp.remote-ip=133.208.98.3; dmarc=none header.from=kba.biglobe.ne.jp; arc=none Received: from rcpt-expgw.biglobe.ne.jp ([133.208.98.3]:33998) by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) id 1l1mdI-000Far-9D; Tue, 19 Jan 2021 08:45:02 +0000 Received: from vc-gw.biglobe.ne.jp by rcpt-expgw.biglobe.ne.jp (hngd/4514161018) with ESMTP id 10J8iqqO020813; Tue, 19 Jan 2021 17:44:52 +0900 Received: from smtp-gw.biglobe.ne.jp ([192.168.154.157]) by vc-gw.biglobe.ne.jp (shby/1011270619) with ESMTP id 10J8iq0P007241; Tue, 19 Jan 2021 17:44:52 +0900 X-Biglobe-Sender: Received: from tamac1.yz.yamagata-u.ac.jp ([133.24.84.20]) by smtp-gw.biglobe.ne.jp id RWoYC0A89941; Tue, 19 Jan 2021 17:44:52 +0900 (JST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.17\)) Subject: Re: [PATCH v3] Make zpty module work in the cygwin and msys2 From: Jun T In-Reply-To: <471C3A77-A559-48F9-B552-1F5C8463FD20@kba.biglobe.ne.jp> Date: Tue, 19 Jan 2021 17:44:51 +0900 Cc: Peiyuan Song Content-Transfer-Encoding: quoted-printable Message-Id: <6FEB1906-D455-4D9B-9E45-63897A7EAFB5@kba.biglobe.ne.jp> References: <5444AEBC-5A8F-438E-89C6-21EB5741E22D@kba.biglobe.ne.jp> <471C3A77-A559-48F9-B552-1F5C8463FD20@kba.biglobe.ne.jp> To: zsh-workers@zsh.org X-Mailer: Apple Mail (2.3445.104.17) X-Biglobe-Spnum: 40731 X-Seq: 47849 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: Archived-At: > 2021/01/18 14:43=E3=80=81I wrote: >=20 > 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 =20 - if [[ $OSTYPE =3D=3D cygwin ]]; then - ZTST_skip=3D'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=3D"the zsh/zpty module is not available" - elif [[ $OSTYPE =3D cygwin ]]; then - ZTST_unimplemented=3D"the zsh/zpty module does not work on Cygwin" fi =20 %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 @@ =20 %prep =20 - if [[ $OSTYPE =3D=3D cygwin ]]; then - ZTST_unimplemented=3D'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=3D PS2=3D 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 =3D cygwin ]]; then - ZTST_unimplemented=3D"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 =3D cygwin ]]; then - ZTST_unimplemented=3D"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=3Dxterm-256color if [[ ${+termcap} !=3D 1 || ${termcap[Co]} !=3D <-> || ${termcap[Co]} = -lt 256 ]]; then ZTST_unimplemented=3D"no termcap module OR termcap doesn't support = 256 or more colors" - elif [[ $OSTYPE =3D=3D cygwin ]]; then - ZTST_unimplemented=3D'the zsh/zpty module does not work on Cygwin' elif zmodload zsh/zpty 2> /dev/null; then zpty_start() { export PS1=3D PS2=3D 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 =3D cygwin ]]; then - ZTST_unimplemented=3D"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:/}{} =20 # Test for regression introduced by workers/41242, raised in = workers/43842 + if [[ $OSTYPE =3D cygwin ]]; then + ZTST_skip=3D"\\ 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=3D$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. =20 %prep - if [[ $OSTYPE =3D cygwin ]]; then - ZTST_unimplemented=3D"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. =20 %prep - if [[ $OSTYPE =3D cygwin ]]; then - ZTST_unimplemented=3D"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