From 9688ef723f53cdc62506a86981359a4bc8421716 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sun, 18 Aug 2024 20:42:25 +0100 Subject: [PATCH] tests: use a link-farm again, but only per-file --- tests/default.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/tests/default.nix b/tests/default.nix index 7af51592..015f9572 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -46,23 +46,21 @@ builtins.listToAttrs ( # or a child attr named `module`. prepareModule = case: case.module or (lib.removeAttrs case [ "tests" ]); dontRunModule = case: case.tests.dontRun or false; - in - { - name = "test-${name}"; - value = mkTestDerivationFromNixvimModule { - inherit name; - tests = builtins.map ( - { name, case }: - { + mkTest = + { name, case }: + { + inherit name; + path = mkTestDerivationFromNixvimModule { inherit name; module = prepareModule case; dontRun = dontRunModule case; - } - ) cases; - # Use the global dontRun only if we don't have a list of modules - dontRun = dontRunModule cases; - pkgs = pkgsUnfree; - }; + pkgs = pkgsUnfree; + }; + }; + in + { + name = "test-${name}"; + value = pkgs.linkFarm "test-${name}" (lib.map mkTest cases); } ) (testFiles ++ [ exampleFiles ]) )