From 57634b99c1b836d29af878071d4b9afb0be7c1ca Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Mar 2015 14:55:10 +0100 Subject: tests: Refactor to something similar as machines/. Similar to callMachine, we now have callTest. The latter uses make-test.nix, so we don't need to import the file explicitly anymore and can just write our VM test by using either an attrset or a lambda function which also gets our own packages in a vuizvui namespace. Signed-off-by: aszlig --- release.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'release.nix') diff --git a/release.nix b/release.nix index a6bbc06d..1193e1bd 100644 --- a/release.nix +++ b/release.nix @@ -8,10 +8,9 @@ in with pkgs.lib; with builtins; { attrs.build.config.system.build.toplevel ) (import ./machines { inherit system; }); - tests = { - aszlig.i3 = import ./tests/aszlig/i3.nix { inherit system; }; - labnet.heinrich = import ./tests/labnet/heinrich.nix { inherit system; }; - }; + tests = mapAttrsRecursiveCond (t: !(t ? test)) (const id) (import ./tests { + inherit system; + }); manual = let modules = import { -- cgit 1.4.1