From bd7fed9a2ff11345720dc2ec298c82520f42609f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Apr 2021 11:57:58 -0400 Subject: kernel: Add tests to passthru.tests --- pkgs/os-specific/linux/kernel/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux/kernel/generic.nix') diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index ac9d6fbb2b5..ffef30ec919 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -55,7 +55,7 @@ , autoModules ? stdenv.hostPlatform.linux-kernel.autoModules , preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false , kernelArch ? stdenv.hostPlatform.linuxArch - +, kernelTests ? [] , ... }: @@ -182,6 +182,7 @@ let kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); + tests = kernelTests; }; in lib.extendDerivation true passthru kernel -- cgit 1.4.1 From d3d40b09fd3967a57aebd6219cc32b6db1c6dd7a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Apr 2021 12:28:15 -0400 Subject: kernel: Add test for RC kernels --- nixos/tests/kernel-generic.nix | 4 +++- pkgs/os-specific/linux/kernel/generic.nix | 2 +- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/kernel/generic.nix') diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index cb08d1ac878..fbead1dc23b 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -20,7 +20,7 @@ let testScript = '' assert "Linux" in machine.succeed("uname -s") - assert "${linuxPackages.kernel.version}" in machine.succeed("uname -a") + assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a") ''; })); in @@ -32,4 +32,6 @@ with pkgs; { linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11; + + linux_testing = makeKernelTest "testing" linuxPackages_testing; } diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index ffef30ec919..0a9c2d11fef 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -178,7 +178,7 @@ let passthru = { features = kernelFeatures; - inherit commonStructuredConfig isXen isZen isHardened isLibre; + inherit commonStructuredConfig isXen isZen isHardened isLibre modDirVersion; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index eec306f2892..f0d41869346 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: with lib; @@ -14,6 +14,8 @@ buildLinux (args // rec { sha256 = "0w0zk2byimdbcvn8myqaq0ab6lyd43493fnkv9a1407dimpxb03d"; }; + kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_testing ]; + # Should the testing kernels ever be built on Hydra? extraMeta.hydraPlatforms = []; -- cgit 1.4.1