diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-12-15 14:05:54 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-12-20 10:52:46 +0100 |
| commit | f173da375da9642fb5dd7047e8d4a2e5a9ac5db4 (patch) | |
| tree | d93ade8dcdeae21fc52457c666c170e77eaa04ea /nixos/lib | |
| parent | aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf (diff) | |
| download | nixlib-f173da375da9642fb5dd7047e8d4a2e5a9ac5db4.tar nixlib-f173da375da9642fb5dd7047e8d4a2e5a9ac5db4.tar.gz nixlib-f173da375da9642fb5dd7047e8d4a2e5a9ac5db4.tar.bz2 nixlib-f173da375da9642fb5dd7047e8d4a2e5a9ac5db4.tar.lz nixlib-f173da375da9642fb5dd7047e8d4a2e5a9ac5db4.tar.xz nixlib-f173da375da9642fb5dd7047e8d4a2e5a9ac5db4.tar.zst nixlib-f173da375da9642fb5dd7047e8d4a2e5a9ac5db4.zip | |
Use only one build of qemu in VM tests
Previously we were using two or three (qemu_kvm, qemu_test, and qemu_test with a different dbus when minimal.nix is included). (cherry picked from commit 8bfa4ce82ea7d23a1d4c6073bcc044e6bf9c4dbe)
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/build-vms.nix | 3 | ||||
| -rw-r--r-- | nixos/lib/testing.nix | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 4e044deca217..1a17a080ba45 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -9,6 +9,8 @@ rec { inherit pkgs; + qemu = pkgs.qemu_test; + # Build a virtual network from an attribute set `{ machine1 = # config1; ... machineN = configN; }', where `machineX' is the @@ -27,6 +29,7 @@ rec { [ ../modules/virtualisation/qemu-vm.nix ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs { key = "no-manual"; services.nixosManual.enable = false; } + { key = "qemu"; system.build.qemu = qemu; } ] ++ optional minimal ../modules/testing/minimal-kernel.nix; extraArgs = { inherit nodes; }; }; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 0fc3978315cc..c1cb5072acad 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -29,7 +29,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ + --prefix PATH : "${lib.makeBinPath [ qemu vde2 netpbm coreutils ]}" \ --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; |