From ba5c7320d4876deb14dba60584fcdf5d5774e13b Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Fri, 20 Sep 2013 17:09:30 +0200 Subject: Add conditional patch to prevent FTBFS on Hurd in case of wrong test assumptions debian/rules now calls debian/patch-test-suite.sh with some parameters to modify or unmodify Test/C02cond.ztst in a way that either the character device for testing zsh's -c either exists or the test for -c is disabled at all. There are three ways in which debian/patch-test-suite.sh can patch Test/C02cond.ztst: * Not at all if /dev/tty exists and is a character device. * Replace all occurrences of /dev/tty with another tty in case /dev/tty does not exist, but others do. * Disable the test for zsh's -c completely if no tty at all is available as to be tested character device. --- .../patches/disable-tests-which-need-dev-tty.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 debian/patches/disable-tests-which-need-dev-tty.patch (limited to 'debian/patches/disable-tests-which-need-dev-tty.patch') diff --git a/debian/patches/disable-tests-which-need-dev-tty.patch b/debian/patches/disable-tests-which-need-dev-tty.patch new file mode 100644 index 000000000..6c2233f3e --- /dev/null +++ b/debian/patches/disable-tests-which-need-dev-tty.patch @@ -0,0 +1,29 @@ +Description: Disable /dev/tty needing test in test-suite + One test in C02cond.ztst of the upstream test-suite always fails if + /dev/tty does not exist or is no character device.. + . + This may be the case on the GNU/Hurd buildds. + . + This patch removes that test. As this is not always wanted, this test + should never be listed in debian/patches/series, but will be applied + when necessary by debian/patch-test-suite.sh. + . + Again: DO NOT LIST THIS PATCH IN THE series FILE. +Author: Axel Beckert + +Index: zsh/Test/C02cond.ztst +=================================================================== +--- zsh.orig/Test/C02cond.ztst 2013-09-14 02:42:12.000000000 +0200 ++++ zsh/Test/C02cond.ztst 2013-09-20 16:04:20.000000000 +0200 +@@ -41,11 +41,6 @@ + fi + 0D:-b cond + +- # Use hardcoded /dev/tty because globbing inside /dev fails on Cygwin +- char=/dev/tty +- [[ -c $char && ! -c $zerolength ]] +-0:-c cond +- + [[ -d . && ! -d zerolength ]] + 0:-d cond + -- cgit v1.2.3