forked from mirrors/nixpkgs
nixos/tests/kernel-generic: make attributes derivations, not functions
Pass the args from kernel-generic.nix's top-level to the individual tests. Makes `nix-build -A nixosTests.kernel-generic.<attr>` and `nix-build nixos/tests/kernel-generic.nix -A <attr>` work as expected.
This commit is contained in:
parent
42e029e48f
commit
17efdfbbca
|
@ -1,7 +1,7 @@
|
||||||
{ system ? builtins.currentSystem
|
{ system ? builtins.currentSystem
|
||||||
, config ? { }
|
, config ? { }
|
||||||
, pkgs ? import ../.. { inherit system config; }
|
, pkgs ? import ../.. { inherit system config; }
|
||||||
}:
|
}@args:
|
||||||
|
|
||||||
with pkgs.lib;
|
with pkgs.lib;
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ let
|
||||||
assert "Linux" in machine.succeed("uname -s")
|
assert "Linux" in machine.succeed("uname -s")
|
||||||
assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
|
assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
|
||||||
'';
|
'';
|
||||||
}));
|
}) args);
|
||||||
in
|
in
|
||||||
with pkgs; {
|
with pkgs; {
|
||||||
linux_4_4 = makeKernelTest "4.4" linuxPackages_4_4;
|
linux_4_4 = makeKernelTest "4.4" linuxPackages_4_4;
|
||||||
|
|
Loading…
Reference in a new issue