diff options
| author | Atemu <atemu.main@gmail.com> | 2023-08-06 15:45:09 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-08-08 19:29:52 +0000 |
| commit | 2ee6bc592414181f4be0fb45b8fd560e3eae0b6d (patch) | |
| tree | ac60fc9c5309869fee04745fa5056b02a918169a | |
| parent | all-tests: exclude passthru attributes from test discovery (diff) | |
| download | nixpkgs-origin/backport-247520-to-release-23.05.tar.gz | |
kernel: fix passthru.testsorigin/backport-247520-to-release-23.05
https://github.com/NixOS/nixpkgs/pull/191540 indirectly broke kernel
passthru.tests; calling the testsForLinuxPackages and testsForKernel functions
with some args intended for some other exposed test-internal function.
Organise the passed-through functions under `passthru` to prevent this from
happening.
(cherry picked from commit a0dcabb6907f00677af78a12fa90ff73bed31061)
| -rw-r--r-- | nixos/tests/kernel-generic.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index e4a8e06df1ef..e69dd550289c 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -42,7 +42,9 @@ let }; in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // { - inherit testsForLinuxPackages; + passthru = { + inherit testsForLinuxPackages; - testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel); + testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel); + }; } diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 56d89f67c64a..a21890a38ca2 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -223,7 +223,7 @@ let + toString (lib.attrNames (if lib.isAttrs args then args else args {})) ) overridableKernel; }; - in [ (nixosTests.kernel-generic.testsForKernel overridableKernel) ] ++ kernelTests; + in [ (nixosTests.kernel-generic.passthru.testsForKernel overridableKernel) ] ++ kernelTests; }; finalKernel = lib.extendDerivation true passthru kernel; |