From 3c61dc3e6f47e95a86da9a152833c8d98e80f97f Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 11 Dec 2015 05:46:26 +0100 Subject: profiles/common: Move gathering tests to lib/. So my gut feeling in 90c080e was't wrong after all, so we need to create jobs for all the tests the machines include. In order to make this easier, we're going to re-use the collection of all test attributes from release.nix so putting it in lib/ makes sense. Signed-off-by: aszlig --- modules/profiles/common.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'modules/profiles') diff --git a/modules/profiles/common.nix b/modules/profiles/common.nix index b7fad147..58d6c27b 100644 --- a/modules/profiles/common.nix +++ b/modules/profiles/common.nix @@ -94,19 +94,8 @@ with lib; ] ++ optional config.vuizvui.enableGlobalNixpkgsConfig nixpkgsConfig; in mkIf config.vuizvui.modifyNixPath (mkOverride 90 nixPath); - _module.args.tests = { - nixos = let - upstreamTests = (import "${nixpkgs}/nixos/release.nix" { - inherit nixpkgs; - }).tests; - isTestOrSystems = attr: attr ? test || attr ? ${system}; - cond = attr: !isTestOrSystems attr; - reduce = attr: if attr ? test then attr else attr.${system}; - in mapAttrsRecursiveCond cond (path: reduce) upstreamTests; - - vuizvui = import ../../tests { - inherit system; - }; + _module.args.tests = import ../../lib/get-tests.nix { + inherit nixpkgs system; }; }; } -- cgit 1.4.1