[Pkg-zsh-commits] [zsh] 01/01: C02cond.ztst: Use /dev/null instead of /dev/tty for -c test

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit 57d31fe2e1df5c18ac37495298600827ffc5bbcd
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Oct 1 14:46:51 2013 +0200

    C02cond.ztst: Use /dev/null instead of /dev/tty for -c test
    
    Hopefully solves the according test suite failures on Hurd.
    
    Suggested by Bart Martens.
---
 .../check-for-dev-tty-before-using-it.patch        |   27 --------------------
 debian/patches/series                              |    2 +-
 ...v-null-instead-of-dev-tty-for-dash-c-test.patch |   21 +++++++++++++++
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/debian/patches/check-for-dev-tty-before-using-it.patch b/debian/patches/check-for-dev-tty-before-using-it.patch
deleted file mode 100644
index c12f30c..0000000
--- a/debian/patches/check-for-dev-tty-before-using-it.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Choose character device for "-c" testing more safely
- Hopefully solves test suite failures on Hurd
-Author: Pino Toscano <pino at debian.org>
-Reviewed-By: Axel Beckert <abe at debian.org>
-
-Index: zsh/Test/C02cond.ztst
-===================================================================
---- zsh.orig/Test/C02cond.ztst	2013-09-20 16:21:32.000000000 +0200
-+++ zsh/Test/C02cond.ztst	2013-09-20 17:59:03.000000000 +0200
-@@ -41,9 +41,14 @@
-   fi
- 0D:-b cond
- 
--  # Use hardcoded /dev/tty because globbing inside /dev fails on Cygwin
--  char=/dev/tty
--  [[ -c $char && ! -c $zerolength ]]
-+  # Hardcoded /dev/tty as necessary for Cygwin may fail on Hurd
-+  tty=$(find /dev/ -nowarn -maxdepth 1 -name 'tty*' -type c -print)
-+  if [[ -n $tty ]]; then
-+    [[ -c $tty[(f)1] && ! -c $zerolength ]]
-+  else
-+    print -u$ZTST_fd 'Warning: Not testing [[ -c tty ]] (no tty found)'
-+    [[ ! -c $zerolength ]]
-+  fi
- 0:-c cond
- 
-   [[ -d . && ! -d zerolength ]]
diff --git a/debian/patches/series b/debian/patches/series
index faf51db..ead3e20 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@ texinfo_remove_leading_whitespace.patch
 vcs_info_guilt_support.patch
 replace-texi2html-with-makeinfo
 fix-segfault-in-compinit-get_cvdef
-check-for-dev-tty-before-using-it.patch
+use-dev-null-instead-of-dev-tty-for-dash-c-test.patch
diff --git a/debian/patches/use-dev-null-instead-of-dev-tty-for-dash-c-test.patch b/debian/patches/use-dev-null-instead-of-dev-tty-for-dash-c-test.patch
new file mode 100644
index 0000000..c8f50fb
--- /dev/null
+++ b/debian/patches/use-dev-null-instead-of-dev-tty-for-dash-c-test.patch
@@ -0,0 +1,21 @@
+Description: Use /dev/null instead of /dev/tty for -c test
+ Hopefully solves the according test suite failures on Hurd. Suggested
+ by Bart Martens.
+Author: Axel Beckert <abe at debian.org>
+Bug: http://www.zsh.org/mla/workers/2013/msg00547.html
+
+Index: zsh/Test/C02cond.ztst
+===================================================================
+--- zsh.orig/Test/C02cond.ztst	2013-09-20 16:21:32.000000000 +0200
++++ zsh/Test/C02cond.ztst	2013-09-20 17:59:03.000000000 +0200
+@@ -41,8 +41,8 @@
+   fi
+ 0D:-b cond
+ 
+-  # Use hardcoded /dev/tty because globbing inside /dev fails on Cygwin
+-  char=/dev/tty
++  # Use hardcoded /dev/null because of /dev/tty issues on GNU/Hurd
++  char=/dev/null
+   [[ -c $char && ! -c $zerolength ]]
+ 0:-c cond
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git