diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2014-06-25 12:45:52 +0200 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2014-06-28 16:05:03 +0200 |
| commit | 6a3e6164bd45eae413c70d3a98e32895b832539f (patch) | |
| tree | 056a633f6fd2a0389d8c16b09781a5f2db018109 /nixos/lib/testing.nix | |
| parent | 71812277d32095beb8ae478843e2ede1c9ecf1ab (diff) | |
| download | nixlib-6a3e6164bd45eae413c70d3a98e32895b832539f.tar nixlib-6a3e6164bd45eae413c70d3a98e32895b832539f.tar.gz nixlib-6a3e6164bd45eae413c70d3a98e32895b832539f.tar.bz2 nixlib-6a3e6164bd45eae413c70d3a98e32895b832539f.tar.lz nixlib-6a3e6164bd45eae413c70d3a98e32895b832539f.tar.xz nixlib-6a3e6164bd45eae413c70d3a98e32895b832539f.tar.zst nixlib-6a3e6164bd45eae413c70d3a98e32895b832539f.zip | |
support for nixos test names
Diffstat (limited to 'nixos/lib/testing.nix')
| -rw-r--r-- | nixos/lib/testing.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 942a2158b15f..063b9bf6c7af 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -37,7 +37,7 @@ rec { # `driver' is the script that runs the network. runTests = driver: stdenv.mkDerivation { - name = "vm-test-run"; + name = "vm-test-run-${driver.testName}"; requiredSystemFeatures = [ "kvm" "nixos-test" ]; @@ -68,9 +68,10 @@ rec { makeTest = - { testScript, makeCoverageReport ? false, ... } @ t: + { testScript, makeCoverageReport ? false, name ? "unnamed", ... } @ t: let + testDriverName = "nixos-test-driver-${name}"; nodes = buildVirtualNetwork ( t.nodes or (if t ? machine then { machine = t.machine; } else { })); @@ -88,10 +89,11 @@ rec { # Generate onvenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. - driver = runCommand "nixos-test-driver" + driver = runCommand testDriverName { buildInputs = [ makeWrapper]; testScript = testScript'; preferLocalBuild = true; + testName = name; } '' mkdir -p $out/bin |