diff options
author | Petr Rockai <prockai@redhat.com> | 2014-09-30 17:06:19 +0200 |
---|---|---|
committer | Petr Rockai <prockai@redhat.com> | 2014-10-01 08:22:54 +0200 |
commit | 85058d653f712527225c80c9f5838c1848219ecc (patch) | |
tree | fcc0c53096a707eb980afd3a7aed8623936fc062 | |
parent | 3875ab72df6ad8d8d9def4d95b31fd1ae98e712f (diff) | |
download | lvm2-85058d653f712527225c80c9f5838c1848219ecc.tar.gz |
NIX: Make timeout and test envvars configurable via --arg.
-rw-r--r-- | nix/default.nix | 5 |
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 |