diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2013-09-20 18:32:31 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2013-09-20 18:32:31 +0200 |
| commit | 22bc9278997a8172766538a2ec6613524df03742 (patch) | |
| tree | f49eaafd775de51fe3c47d607a031c273c681f95 /debian/patches/check-for-dev-tty-before-using-it.patch | |
| parent | a67229c9402418aacbc50fc8b8152d0f57c822a8 (diff) | |
| download | zsh-22bc9278997a8172766538a2ec6613524df03742.tar.gz zsh-22bc9278997a8172766538a2ec6613524df03742.zip | |
Add patch to make test suite "-c" test more flexible, should prevent FTBFS on Hurd
Thanks: Pino Toscano
Diffstat (limited to 'debian/patches/check-for-dev-tty-before-using-it.patch')
| -rw-r--r-- | debian/patches/check-for-dev-tty-before-using-it.patch | 27 |
1 files changed, 27 insertions, 0 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 new file mode 100644 index 000000000..92b0e3a87 --- /dev/null +++ b/debian/patches/check-for-dev-tty-before-using-it.patch @@ -0,0 +1,27 @@ +Description: Choose character device for "-c" testing more safely + Hopefully solves test suite failures on Hurd +Author: Pino Toscano <pino@debian.org> +Reviewed-By: Axel Beckert <abe@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/ -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 ]] |