From 97332d30f62b149aa81a63f798e7e53825e12663 Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Thu, 19 Nov 2015 16:52:08 +0100 Subject: zsh: re-enable tests skipping broken Do not disable all tests, only those broken as zsh/zpty module is not available on hydra. --- pkgs/shells/zsh/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'pkgs/shells/zsh') diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 0e25bba9fe3..7b12ab7cab8 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -21,13 +21,19 @@ stdenv.mkDerivation { buildInputs = [ ncurses coreutils pcre ]; - preConfigure = '' - configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre" - ''; + configureFlags = [ + "--enable-maildir-support" + "--enable-multibyte" + "--enable-zprofile=$out/etc/zprofile" + "--with-tcsetpgrp" + "--enable-pcre" + ]; - # Some tests fail on hydra, see - # http://hydra.nixos.org/build/25637689/nixlog/1 - doCheck = false; + # the zsh/zpty module is not available on hydra + # so skip groups Y Z + checkFlagsArray = '' + (TESTNUM=A TESTNUM=B TESTNUM=C TESTNUM=D TESTNUM=E TESTNUM=V TESTNUM=W) + ''; # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' -- cgit 1.4.1