jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #247520 from Atemu/fix/kernel-passthru.tests

Browse Source 
kernel: fix passthru.tests
This commit is contained in:
Robert Hensing 2023-08-08 21:29:19 +02:00 committed by GitHub
commit bc9d2d6a7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -21,7 +21,7 @@ let
if isAttrs val if isAttrs val
then then
if hasAttr "test" val then callTest val if hasAttr "test" val then callTest val
else mapAttrs (n: s: discoverTests s) val else mapAttrs (n: s: if n == "passthru" then s else discoverTests s) val
else if isFunction val else if isFunction val
then then
# Tests based on make-test-python.nix will return the second lambda # Tests based on make-test-python.nix will return the second lambda

6
nixos/tests/kernel-generic.nix
View File

@ -42,7 +42,9 @@ let
}; };
in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // { in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // {
inherit testsForLinuxPackages; passthru = {
inherit testsForLinuxPackages;
testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel); testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel);
};
} }

2
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -220,7 +220,7 @@ let
+ toString (lib.attrNames (if lib.isAttrs args then args else args {})) + toString (lib.attrNames (if lib.isAttrs args then args else args {}))
) overridableKernel; ) overridableKernel;
}; };
in [ (nixosTests.kernel-generic.testsForKernel overridableKernel) ] ++ kernelTests; in [ (nixosTests.kernel-generic.passthru.testsForKernel overridableKernel) ] ++ kernelTests;
}; };
finalKernel = lib.extendDerivation true passthru kernel; finalKernel = lib.extendDerivation true passthru kernel;