summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-08-29 23:24:54 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-08-29 23:24:54 +0000
commit0bfba4cbf5983ea0039838e6764e86f5449275c5 (patch)
treebaa41da47e62352a0d01c352044c768a49e0ecc7
parent68ebbb6093e64c89fbacd7332862a10c9ef48c9c (diff)
downloadnixpkgs-0bfba4cbf5983ea0039838e6764e86f5449275c5.tar
nixpkgs-0bfba4cbf5983ea0039838e6764e86f5449275c5.tar.gz
nixpkgs-0bfba4cbf5983ea0039838e6764e86f5449275c5.tar.bz2
nixpkgs-0bfba4cbf5983ea0039838e6764e86f5449275c5.tar.lz
nixpkgs-0bfba4cbf5983ea0039838e6764e86f5449275c5.tar.xz
nixpkgs-0bfba4cbf5983ea0039838e6764e86f5449275c5.tar.zst
nixpkgs-0bfba4cbf5983ea0039838e6764e86f5449275c5.zip
* Require KVM.
svn path=/nixos/trunk/; revision=23538
-rw-r--r--lib/testing.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/testing.nix b/lib/testing.nix
index 747419301b7..02c011c5bc8 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -15,10 +15,13 @@ rec {
   runTests = network: tests:
     stdenv.mkDerivation {
       name = "vm-test-run";
+      
+      requiredSystemFeatures = [ "kvm" ];
+      
       inherit tests;
       
       buildInputs = [ pkgs.qemu_kvm pkgs.imagemagick ];
-      
+
       buildCommand =
         ''
           mkdir $out
@@ -138,10 +141,11 @@ rec {
         cp ${./test-driver/Machine.pm} Machine.pm
         export tests='${testscript}'
         ${perl}/bin/perl ${./test-driver/test-driver.pl} ${vms}/vms/*/bin/run-*-vm
-      '';
+      ''; # */
 
     in
       lib.overrideDerivation drv (attrs: {
+        requiredSystemFeatures = [ "kvm" ];
         builder = "${bash}/bin/sh";
         args = ["-e" vmRunCommand];
         origArgs = attrs.args;