* Move the serial console kernel parameters to test-instrumentation.nix.
svn path=/nixos/trunk/; revision=19275
This commit is contained in:
parent
bffb5450e5
commit
ec3398e4b2
|
@ -96,7 +96,7 @@ sub start {
|
||||||
dup2(fileno(NUL), fileno(STDIN));
|
dup2(fileno(NUL), fileno(STDIN));
|
||||||
$ENV{TMPDIR} = $self->{stateDir};
|
$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_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;
|
chdir $self->{stateDir} or die;
|
||||||
exec $self->{startCommand};
|
exec $self->{startCommand};
|
||||||
die;
|
die;
|
||||||
|
|
|
@ -69,7 +69,8 @@ in
|
||||||
|
|
||||||
# Panic if an error occurs in stage 1 (rather than waiting for
|
# Panic if an error occurs in stage 1 (rather than waiting for
|
||||||
# user intervention).
|
# 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.
|
# `xwininfo' is used by the test driver to query open windows.
|
||||||
environment.systemPackages = [ pkgs.xorg.xwininfo ];
|
environment.systemPackages = [ pkgs.xorg.xwininfo ];
|
||||||
|
|
|
@ -120,6 +120,7 @@ let
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
firefox = t.firefox.test;
|
firefox = t.firefox.test;
|
||||||
|
installer = t.installer.test;
|
||||||
kde4 = t.kde4.test;
|
kde4 = t.kde4.test;
|
||||||
quake3 = t.quake3.test;
|
quake3 = t.quake3.test;
|
||||||
subversion = t.subversion.report;
|
subversion = t.subversion.report;
|
||||||
|
|
|
@ -11,7 +11,6 @@ rec {
|
||||||
[ ../modules/installer/cd-dvd/installation-cd-graphical.nix
|
[ ../modules/installer/cd-dvd/installation-cd-graphical.nix
|
||||||
../modules/testing/test-instrumentation.nix
|
../modules/testing/test-instrumentation.nix
|
||||||
{ key = "serial";
|
{ key = "serial";
|
||||||
boot.kernelParams = [ "console=tty1" "console=ttyS0" "panic=1" ];
|
|
||||||
boot.loader.grub.timeout = pkgs.lib.mkOverride 0 {} 0;
|
boot.loader.grub.timeout = pkgs.lib.mkOverride 0 {} 0;
|
||||||
|
|
||||||
# The test cannot access the network, so any sources we
|
# The test cannot access the network, so any sources we
|
||||||
|
@ -39,7 +38,6 @@ rec {
|
||||||
boot.loader.grub.version = 2;
|
boot.loader.grub.version = 2;
|
||||||
boot.loader.grub.device = "/dev/vda";
|
boot.loader.grub.device = "/dev/vda";
|
||||||
boot.initrd.kernelModules = [ "ext3" ];
|
boot.initrd.kernelModules = [ "ext3" ];
|
||||||
boot.kernelParams = [ "console=tty1" "console=ttyS0" "panic=1" ];
|
|
||||||
|
|
||||||
fileSystems =
|
fileSystems =
|
||||||
[ { mountPoint = "/";
|
[ { mountPoint = "/";
|
||||||
|
@ -115,7 +113,7 @@ rec {
|
||||||
$machine->mustSucceed("type -tP ls") =~ /profiles/
|
$machine->mustSucceed("type -tP ls") =~ /profiles/
|
||||||
or die "nix-env failed";
|
or die "nix-env failed";
|
||||||
|
|
||||||
#$machine->mustSucceed("nixos-rebuild switch");
|
#$machine->mustSucceed("nixos-rebuild switch >&2");
|
||||||
|
|
||||||
$machine->shutdown;
|
$machine->shutdown;
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue