Author: ludo Date: Fri Sep 9 19:48:20 2011 New Revision: 29141 URL: https://ssl.nixos.org/websvn/nix/?rev=29141&sc=1
Log: mpfr: Actually use Valgrind, through $VALGRIND. Modified: hydra-config/gnu/trunk/mpfr/release.nix Modified: hydra-config/gnu/trunk/mpfr/release.nix ============================================================================== --- hydra-config/gnu/trunk/mpfr/release.nix Fri Sep 9 19:48:15 2011 (r29140) +++ hydra-config/gnu/trunk/mpfr/release.nix Fri Sep 9 19:48:20 2011 (r29141) @@ -41,9 +41,6 @@ [ "Paul Zimmermann <paul.zimmerm...@loria.fr>" ]; }; - configureFlags = pkgs: - pkgs.lib.optional pkgs.stdenv.isLinux [ "--enable-valgrind" ]; - preCheck = "export GMP_CHECK_RANDOMIZE=true"; # The minimum required GMP version. @@ -52,6 +49,10 @@ inherit (pkgs) stdenv fetchurl m4; }; + # Return true if we should use Valgrind on the given platform. + useValgrind = stdenv: + stdenv.system == "x86_64-linux"; + jobs = import ../gnu-jobs.nix { name = "mpfr"; @@ -71,10 +72,14 @@ build = pkgs: { buildInputs = [ gmp ] - ++ (pkgs.lib.optional pkgs.stdenv.isLinux pkgs.valgrind); + ++ (pkgs.lib.optional (useValgrind pkgs.stdenv) pkgs.valgrind); - configureFlags = (configureFlags pkgs); - inherit preCheck; + preCheck = preCheck + + (if useValgrind pkgs.stdenv + then '' + export VALGRIND="valgrind -q --error-exitcode=1" + '' + else ""); }; coverage = pkgs: { buildInputs = [ gmp ]; inherit preCheck; }; _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits