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

nixosTests: use the newly-extracted all-tests.nix

Browse Source
This commit is contained in:
Léo Gaspard 2018-11-11 23:03:09 +09:00
parent 2986ce16a8
commit 6aedf6a5c8
No known key found for this signature in database
GPG Key ID: 8A55848B6090F9CF
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/top-level/all-packages.nix
View File

@ -73,23 +73,11 @@ with pkgs;
### Push NixOS tests inside the fixed point
nixosTests =
let
# TODO(Ericson2314,ekleog): Check this will work correctly with cross-
system = builtins.currentSystem;
rawTests = (import ../../nixos/release.nix {
nixpkgs = pkgs;
}).tests;
testNames = builtins.attrNames rawTests;
filteredList = builtins.filter
(test: rawTests.${test} ? ${system})
testNames;
finalList = map
(test: { name = test; value = rawTests.${test}.${system}; })
filteredList;
finalTests = builtins.listToAttrs finalList;
in
finalTests;
nixosTests = import ../../nixos/tests/all-tests.nix {
inherit pkgs;
system = stdenv.hostPlatform.system;
callTest = t: t.test;
};
### BUILD SUPPORT