Mirrors/disko
2
0
Fork 0
mirror of https://github.com/nix-community/disko synced 2024-11-10 06:14:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

make tests risv64 compatible

Browse source
This commit is contained in:
Jörg Thalheim 2023-08-13 20:28:45 +02:00 committed by mergify[bot]
parent 3ba5bb2de6
commit 358b87fd44
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/tests.nix
View file

@ -50,7 +50,7 @@ let
, bootCommands ? "" , bootCommands ? ""
, extraInstallerConfig ? { } , extraInstallerConfig ? { }
, extraSystemConfig ? { } , extraSystemConfig ? { }
, efi ? true , efi ? !pkgs.hostPlatform.isRiscV64
, postDisko ? "" , postDisko ? ""
, testMode ? "module" # can be one of direct module cli , testMode ? "module" # can be one of direct module cli
, testBoot ? true # if we actually want to test booting or just create/mount , testBoot ? true # if we actually want to test booting or just create/mount

4
tests/default.nix
View file

@ -12,7 +12,9 @@ let
(x: lib.hasSuffix ".nix" x && x != "default.nix") (x: lib.hasSuffix ".nix" x && x != "default.nix")
(lib.attrNames (builtins.readDir ./.)) (lib.attrNames (builtins.readDir ./.))
); );
incompatibleTests = lib.optionals pkgs.buildPlatform.isRiscV64 [ "zfs" "zfs-over-legacy" "cli" ];
allCompatibleFilenames = lib.subtractLists incompatibleTests allTestFilenames;
allTests = lib.genAttrs allTestFilenames (test: import (./. + "/${test}.nix") { inherit diskoLib pkgs; }); allTests = lib.genAttrs allCompatibleFilenames (test: import (./. + "/${test}.nix") { inherit diskoLib pkgs; });
in in
allTests allTests