mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
* 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:
parent
b1aa227cbd
commit
137c5c65bd
|
@ -1,6 +1,7 @@
|
||||||
{ nixos ? ./..
|
{ nixos ? ./..
|
||||||
, nixpkgs ? /etc/nixos/nixpkgs
|
, nixpkgs ? /etc/nixos/nixpkgs
|
||||||
, services ? /etc/nixos/services
|
, services ? /etc/nixos/services
|
||||||
|
, system ? builtins.currentSystem
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let pkgs = import nixpkgs { config = {}; }; in
|
let pkgs = import nixpkgs { config = {}; }; in
|
||||||
|
@ -55,7 +56,7 @@ rec {
|
||||||
nodes: configuration:
|
nodes: configuration:
|
||||||
|
|
||||||
import "${nixos}/lib/eval-config.nix" {
|
import "${nixos}/lib/eval-config.nix" {
|
||||||
inherit nixpkgs services;
|
inherit nixpkgs services system;
|
||||||
modules = [ configuration ];
|
modules = [ configuration ];
|
||||||
extraArgs = { inherit nodes; };
|
extraArgs = { inherit nodes; };
|
||||||
/* !!! bug in the module/option handling: this ignores the
|
/* !!! bug in the module/option handling: this ignores the
|
||||||
|
|
|
@ -90,9 +90,11 @@ sub connect {
|
||||||
|
|
||||||
$self->start;
|
$self->start;
|
||||||
|
|
||||||
|
my $try = 0;
|
||||||
while (1) {
|
while (1) {
|
||||||
last if -e ($self->{stateDir} . "/running");
|
last if -e ($self->{stateDir} . "/running");
|
||||||
sleep 1;
|
sleep 1;
|
||||||
|
die ("VM " . $self->{name} . " timed out") if $try++ > 180;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
|
|
|
@ -103,6 +103,7 @@ let
|
||||||
|
|
||||||
(import ./tests/subversion.nix {
|
(import ./tests/subversion.nix {
|
||||||
inherit nixpkgs services;
|
inherit nixpkgs services;
|
||||||
|
system = "i686-linux";
|
||||||
}).report;
|
}).report;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ nixos ? ./..
|
{ nixos ? ./..
|
||||||
, nixpkgs ? /etc/nixos/nixpkgs
|
, nixpkgs ? /etc/nixos/nixpkgs
|
||||||
, services ? /etc/nixos/services
|
, services ? /etc/nixos/services
|
||||||
|
, system ? builtins.currentSystem
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with import ../lib/build-vms.nix { inherit nixos nixpkgs services; };
|
with import ../lib/build-vms.nix { inherit nixos nixpkgs services; };
|
||||||
|
|
Loading…
Reference in a new issue