Merge pull request #285035 from Ma27/kernel-rust-matrix

nixos/tests/kernel-rust: test against 6.7 and testing (6.8rc1)

Changed files
+40 -27
nixos
+1 -1
nixos/tests/all-tests.nix
···
kerberos = handleTest ./kerberos/default.nix {};
kernel-generic = handleTest ./kernel-generic.nix {};
kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {};
-
kernel-rust = runTestOn ["x86_64-linux"] ./kernel-rust.nix;
+
kernel-rust = handleTestOn ["x86_64-linux"] ./kernel-rust.nix {};
keter = handleTest ./keter.nix {};
kexec = handleTest ./kexec.nix {};
keycloak = discoverTests (import ./keycloak.nix);
+39 -26
nixos/tests/kernel-rust.nix
···
-
{ pkgs, ... }: {
-
name = "kernel-rust";
-
meta = with pkgs.lib.maintainers; {
-
maintainers = [ blitz ];
-
};
+
{ system ? builtins.currentSystem
+
, config ? { }
+
, pkgs ? import ../.. { inherit system config; }
+
}:
-
nodes.machine = { config, pkgs, ... }:
-
{
-
boot.kernelPackages = pkgs.linuxPackages_testing;
+
let
+
inherit (pkgs.lib) const filterAttrs mapAttrs;
-
boot.extraModulePackages = [
-
config.boot.kernelPackages.rust-out-of-tree-module
-
];
-
-
boot.kernelPatches = [
-
{
-
name = "Rust Support";
-
patch = null;
-
features = {
-
rust = true;
-
};
-
}
-
];
+
kernelRustTest = kernelPackages: import ./make-test-python.nix ({ lib, ... }: {
+
name = "kernel-rust";
+
meta.maintainers = with lib.maintainers; [ blitz ma27 ];
+
nodes.machine = { config, ... }: {
+
boot = {
+
inherit kernelPackages;
+
extraModulePackages = [ config.boot.kernelPackages.rust-out-of-tree-module ];
+
kernelPatches = [
+
{
+
name = "Rust Support";
+
patch = null;
+
features = {
+
rust = true;
+
};
+
}
+
];
+
};
};
+
testScript = ''
+
machine.wait_for_unit("default.target")
+
machine.succeed("modprobe rust_out_of_tree")
+
'';
+
});
-
testScript = ''
-
machine.wait_for_unit("default.target")
-
machine.succeed("modprobe rust_out_of_tree")
-
'';
-
}
+
kernels = {
+
inherit (pkgs.linuxKernel.packages) linux_testing;
+
}
+
// filterAttrs
+
(const (x: let
+
inherit (builtins.tryEval (
+
x.rust-out-of-tree-module or null != null
+
)) success value;
+
in success && value))
+
pkgs.linuxKernel.vanillaPackages;
+
in mapAttrs (const kernelRustTest) kernels