From e4d5e22c91561a6722996e6b5c9735ae1397571d Mon Sep 17 00:00:00 2001
From: Petr Rockai <prockai@redhat.com>
Date: Tue, 30 Sep 2014 17:06:19 +0200
Subject: NIX: Make timeout and test envvars configurable via --arg.

---
 nix/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'nix')

diff --git a/nix/default.nix b/nix/default.nix
index 5999bd2ae..fe1c377ba 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -4,7 +4,7 @@
   fc20_32_updates ? "", fc20_64_updates ? "",
   fc19_32_updates ? "", fc19_64_updates ? "",
   fc18_32_updates ? "", fc18_64_updates ? "",
-  T ? "" }:
+  T ? "", ENV ? "", timeout ? 60 }:
 
 let
   pkgs = import nixpkgs {};
@@ -58,8 +58,9 @@ let
            watch="--watch /xchg/udevd.log"
          fi
 
+         export ${ENV}
          lvm2-testsuite --batch --outdir /xchg/results --continue \
-             --fatal-timeouts --heartbeat /xchg/heartbeat \
+             --timeout ${toString timeout} --fatal-timeouts --heartbeat /xchg/heartbeat \
              --flavours ${flavour} $watch --kmsg ${if lib.eqStrings T "" then "" else "--only ${T}"}
 
          # TODO: coverage reports
-- 
cgit v1.2.1