public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tests/virtualbox: Improve logging.

Browse Source 
This also makes showvminfo obsolete, as we get the same information from
the hosts log.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-12-15 19:17:38 +01:00
parent d85fabd68c
commit 8bbf1dc80e
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/tests/virtualbox.nix
View File

@ -60,6 +60,12 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
]; ];
}; };
mkLog = logfile: tag: let
rotated = map (i: "${logfile}.${toString i}") (range 1 9);
all = concatMapStringsSep " " (f: "\"${f}\"") ([logfile] ++ rotated);
logcmd = "tail -F ${all} 2> /dev/null | logger -t \"${tag}\"";
in "$machine->execute(ru '${logcmd} & disown');";
testVM = vmName: vmScript: let testVM = vmName: vmScript: let
cfg = (import ../lib/eval-config.nix { cfg = (import ../lib/eval-config.nix {
system = "i686-linux"; system = "i686-linux";
@ -166,7 +172,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
description = "VirtualBox Test Machine Log"; description = "VirtualBox Test Machine Log";
serviceConfig.StandardInput = "socket"; serviceConfig.StandardInput = "socket";
serviceConfig.StandardOutput = "syslog"; serviceConfig.StandardOutput = "syslog";
serviceConfig.SyslogIdentifier = "vbox-${name}"; serviceConfig.SyslogIdentifier = "GUEST-${name}";
serviceConfig.ExecStart = "${pkgs.coreutils}/bin/cat"; serviceConfig.ExecStart = "${pkgs.coreutils}/bin/cat";
}; };
}); });
@ -195,8 +201,9 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
vbm("storageattach ${name} ${diskFlags}"); vbm("storageattach ${name} ${diskFlags}");
vbm("sharedfolder add ${name} ${sharedFlags}"); vbm("sharedfolder add ${name} ${sharedFlags}");
vbm("sharedfolder add ${name} ${nixstoreFlags}"); vbm("sharedfolder add ${name} ${nixstoreFlags}");
vbm("showvminfo ${name} >&2");
cleanup_${name}; cleanup_${name};
${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"}
} }
sub destroyVM_${name} { sub destroyVM_${name} {
@ -314,6 +321,8 @@ in {
$machine->waitForX; $machine->waitForX;
${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"}
createVM_simple; createVM_simple;
subtest "simple-gui", sub { subtest "simple-gui", sub {