Browse Source

nixos/tests: move kernel-params test to misc

nsd-state-dir
Joachim Fasting 5 years ago
parent
commit
ffd56ba4f6
No known key found for this signature in database GPG Key ID: 66EAB6B14F6B6E0D
  1. 1
      nixos/release-combined.nix
  2. 1
      nixos/release.nix
  3. 24
      nixos/tests/kernel-params.nix
  4. 6
      nixos/tests/misc.nix

1
nixos/release-combined.nix

@ -96,7 +96,6 @@ in rec {
nixos.tests.plasma5.x86_64-linux # avoid big build on i686
(all nixos.tests.kernel-latest)
(all nixos.tests.kernel-lts)
(all nixos.tests.kernel-params)
#(all nixos.tests.lightdm)
(all nixos.tests.login)
(all nixos.tests.misc)

1
nixos/release.nix

@ -267,7 +267,6 @@ in rec {
tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
tests.kernel-latest = callTest tests/kernel-latest.nix {};
tests.kernel-lts = callTest tests/kernel-lts.nix {};
tests.kernel-params = callTest tests/kernel-params.nix {};
tests.keystone = callTest tests/keystone.nix {};
tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };

24
nixos/tests/kernel-params.nix

@ -1,24 +0,0 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "kernel-params";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
};
machine = { config, lib, pkgs, ... }:
{
boot.kernelPackages = pkgs.linuxPackages;
boot.kernelParams = [
"nohibernate"
"page_poison=1"
"vsyscall=none"
];
};
testScript =
''
$machine->fail("cat /proc/cmdline | grep page_poison=0");
$machine->succeed("cat /proc/cmdline | grep nohibernate");
$machine->succeed("cat /proc/cmdline | grep page_poison=1");
$machine->succeed("cat /proc/cmdline | grep vsyscall=none");
'';
})

6
nixos/tests/misc.nix

@ -26,6 +26,7 @@ import ./make-test.nix ({ pkgs, ...} : {
users.users.sybil = { isNormalUser = true; group = "wheel"; };
security.sudo = { enable = true; wheelNeedsPassword = false; };
boot.kernel.sysctl."vm.swappiness" = 1;
boot.kernelParams = [ "vsyscall=emulate" ];
};
testScript =
@ -126,5 +127,10 @@ import ./make-test.nix ({ pkgs, ...} : {
$machine->execute('sysctl vm.swappiness=60');
$machine->succeed('[ `sysctl -ne vm.swappiness` = 60 ]');
};
# Test boot parameters
subtest "bootparam", sub {
$machine->succeed('grep -Fq vsyscall=emulate /proc/cmdline');
};
'';
})
Loading…
Cancel
Save