47849: do not skip tests requiring zpty on Cygwin

10 files changed, 17 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index eb99fcd5b..4cf94b1f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
 
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