From 457653d99c31bc8e558bcbd38c7d23ed9fa8fb97 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 2 May 2021 15:39:39 +0200 Subject: [PATCH] nixosTests.kernel-generic: expose test-making functions Changed the name to be clearer, 'makeKernelTest' could imply that it wants a kernel pkg as its arg while it actually needs a set of linuxPackages. --- nixos/tests/kernel-generic.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 04e3cae117af..09ca43eac813 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -6,7 +6,7 @@ with pkgs.lib; let - makeKernelTest = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: { + testsForLinuxPackages = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: { name = "kernel-${linuxPackages.kernel.version}"; meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; @@ -41,4 +41,8 @@ let linuxPackages_testing; }; -in mapAttrs (_: kernel: makeKernelTest kernel) kernels +in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // { + inherit testsForLinuxPackages; + + testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel); +}