b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* Move the serial console kernel parameters to test-instrumentation.nix.

Browse source 
svn path=/nixos/trunk/; revision=19275
This commit is contained in:
Eelco Dolstra 2010-01-06 21:16:57 +00:00
parent bffb5450e5
commit ec3398e4b2
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/test-driver/Machine.pm
View file

@ -96,7 +96,7 @@ sub start {
dup2(fileno(NUL), fileno(STDIN));
$ENV{TMPDIR} = $self->{stateDir};
$ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr";
$ENV{QEMU_KERNEL_PARAMS} = "console=tty1 console=ttyS0 panic=1 hostTmpDir=$ENV{TMPDIR}";
$ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
chdir $self->{stateDir} or die;
exec $self->{startCommand};
die;

3
modules/testing/test-instrumentation.nix
View file

@ -69,7 +69,8 @@ in
# Panic if an error occurs in stage 1 (rather than waiting for
# user intervention).
boot.kernelParams = [ "stage1panic" ];
boot.kernelParams =
[ "console=tty1" "console=ttyS0" "panic=1" "stage1panic" ];
# `xwininfo' is used by the test driver to query open windows.
environment.systemPackages = [ pkgs.xorg.xwininfo ];

1
release.nix
View file

@ -120,6 +120,7 @@ let
};
in {
firefox = t.firefox.test;
installer = t.installer.test;
kde4 = t.kde4.test;
quake3 = t.quake3.test;
subversion = t.subversion.report;

4
tests/installer.nix
View file

@ -11,7 +11,6 @@ rec {
[ ../modules/installer/cd-dvd/installation-cd-graphical.nix
../modules/testing/test-instrumentation.nix
{ key = "serial";
boot.kernelParams = [ "console=tty1" "console=ttyS0" "panic=1" ];
boot.loader.grub.timeout = pkgs.lib.mkOverride 0 {} 0;
# The test cannot access the network, so any sources we
@ -39,7 +38,6 @@ rec {
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/vda";
boot.initrd.kernelModules = [ "ext3" ];
boot.kernelParams = [ "console=tty1" "console=ttyS0" "panic=1" ];
fileSystems =
[ { mountPoint = "/";
@ -115,7 +113,7 @@ rec {
$machine->mustSucceed("type -tP ls") =~ /profiles/
or die "nix-env failed";
#$machine->mustSucceed("nixos-rebuild switch");
#$machine->mustSucceed("nixos-rebuild switch >&2");
$machine->shutdown;
'';