git.iko.soy/typeable/nixpkgs
on master help sign in
kernel: Add test for RC kernels
commitd3d40b09fd3967a57aebd6219cc32b6db1c6dd7a authorTim Steinbach <tim@nequissimus.com> dateWed 7 Apr 2021, 12:28 (6 years ago) parent491f0a6
3 files changed+7−3
nixos/tests/kernel-generic.nix+3−1 pkgs/os-specific/linux/kernel/generic.nix+1−1 pkgs/os-specific/linux/kernel/linux-testing.nix+3−1
nixos/tests/kernel-generic.nix+3−1
@@ -20,7 +20,7 @@ let
2020 testScript =
2121 ''
2222 assert "Linux" in machine.succeed("uname -s")
23− assert "${linuxPackages.kernel.version}" in machine.succeed("uname -a")
23+ assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
2424 '';
2525 }));
2626in
@@ -32,4 +32,6 @@ with pkgs; {
3232 linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4;
3333 linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10;
3434 linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11;
35+
36+ linux_testing = makeKernelTest "testing" linuxPackages_testing;
3537}
pkgs/os-specific/linux/kernel/generic.nix+1−1
@@ -178,7 +178,7 @@ let
178178
179179 passthru = {
180180 features = kernelFeatures;
181− inherit commonStructuredConfig isXen isZen isHardened isLibre;
181+ inherit commonStructuredConfig isXen isZen isHardened isLibre modDirVersion;
182182 kernelOlder = lib.versionOlder version;
183183 kernelAtLeast = lib.versionAtLeast version;
184184 passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
pkgs/os-specific/linux/kernel/linux-testing.nix+3−1
@@ -1,4 +1,4 @@
1−{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
1+{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
22
33with lib;
44
@@ -14,6 +14,8 @@ buildLinux (args // rec {
1414 sha256 = "0w0zk2byimdbcvn8myqaq0ab6lyd43493fnkv9a1407dimpxb03d";
1515 };
1616
17+ kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_testing ];
18+
1719 # Should the testing kernels ever be built on Hydra?
1820 extraMeta.hydraPlatforms = [];
1921