* Require KVM.
svn path=/nixos/trunk/; revision=23538
This commit is contained in:
parent
68ebbb6093
commit
0bfba4cbf5
|
@ -15,10 +15,13 @@ rec {
|
||||||
runTests = network: tests:
|
runTests = network: tests:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "vm-test-run";
|
name = "vm-test-run";
|
||||||
|
|
||||||
|
requiredSystemFeatures = [ "kvm" ];
|
||||||
|
|
||||||
inherit tests;
|
inherit tests;
|
||||||
|
|
||||||
buildInputs = [ pkgs.qemu_kvm pkgs.imagemagick ];
|
buildInputs = [ pkgs.qemu_kvm pkgs.imagemagick ];
|
||||||
|
|
||||||
buildCommand =
|
buildCommand =
|
||||||
''
|
''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
|
@ -138,10 +141,11 @@ rec {
|
||||||
cp ${./test-driver/Machine.pm} Machine.pm
|
cp ${./test-driver/Machine.pm} Machine.pm
|
||||||
export tests='${testscript}'
|
export tests='${testscript}'
|
||||||
${perl}/bin/perl ${./test-driver/test-driver.pl} ${vms}/vms/*/bin/run-*-vm
|
${perl}/bin/perl ${./test-driver/test-driver.pl} ${vms}/vms/*/bin/run-*-vm
|
||||||
'';
|
''; # */
|
||||||
|
|
||||||
in
|
in
|
||||||
lib.overrideDerivation drv (attrs: {
|
lib.overrideDerivation drv (attrs: {
|
||||||
|
requiredSystemFeatures = [ "kvm" ];
|
||||||
builder = "${bash}/bin/sh";
|
builder = "${bash}/bin/sh";
|
||||||
args = ["-e" vmRunCommand];
|
args = ["-e" vmRunCommand];
|
||||||
origArgs = attrs.args;
|
origArgs = attrs.args;
|
||||||
|
|
Loading…
Reference in a new issue