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 <aszlig@redmoonstudios.org>

1 files changed, 3 insertions, 4 deletions

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 <nixpkgs/nixos/lib/eval-config.nix> {