summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2014-09-30 17:06:19 +0200
committerPetr Rockai <prockai@redhat.com>2015-02-05 13:47:21 +0100
commite4d5e22c91561a6722996e6b5c9735ae1397571d (patch)
treefd8379cc1e6f7202210c7f26c5cb80939cdd6037 /nix
parentc2b7642d4d8df4a9d6798f339415466c9b69a805 (diff)
downloadlvm2-e4d5e22c91561a6722996e6b5c9735ae1397571d.tar.gz
NIX: Make timeout and test envvars configurable via --arg.
Diffstat (limited to 'nix')
-rw-r--r--nix/default.nix5
1 files changed, 3 insertions, 2 deletions
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