* Added a timeout for starting the VM. TODO: handle SIGCHLD from

qemu.
* Do the subversion test on i686-linux.  

svn path=/nixos/trunk/; revision=16923
This commit is contained in:
Eelco Dolstra 2009-09-02 08:36:30 +00:00
parent b1aa227cbd
commit 137c5c65bd
4 changed files with 6 additions and 1 deletions

View file

@ -1,6 +1,7 @@
{ nixos ? ./..
, nixpkgs ? /etc/nixos/nixpkgs
, services ? /etc/nixos/services
, system ? builtins.currentSystem
}:
let pkgs = import nixpkgs { config = {}; }; in
@ -55,7 +56,7 @@ rec {
nodes: configuration:
import "${nixos}/lib/eval-config.nix" {
inherit nixpkgs services;
inherit nixpkgs services system;
modules = [ configuration ];
extraArgs = { inherit nodes; };
/* !!! bug in the module/option handling: this ignores the

View file

@ -90,9 +90,11 @@ sub connect {
$self->start;
my $try = 0;
while (1) {
last if -e ($self->{stateDir} . "/running");
sleep 1;
die ("VM " . $self->{name} . " timed out") if $try++ > 180;
}
while (1) {

View file

@ -103,6 +103,7 @@ let
(import ./tests/subversion.nix {
inherit nixpkgs services;
system = "i686-linux";
}).report;

View file

@ -1,6 +1,7 @@
{ nixos ? ./..
, nixpkgs ? /etc/nixos/nixpkgs
, services ? /etc/nixos/services
, system ? builtins.currentSystem
}:
with import ../lib/build-vms.nix { inherit nixos nixpkgs services; };