diff options
author | Robert Hensing <robert@roberthensing.nl> | 2022-06-06 19:24:30 +0200 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2022-06-06 19:24:30 +0200 |
commit | 51224f522f7a7d3a00ac2da4ceeedeea296cd2ed (patch) | |
tree | c39c592ad7b9cd09781f5ac84cda5e2333c67829 | |
parent | 9a995f5c6a0b7e782017b725eb8a34ff0d7de527 (diff) |
nixosTests.allDrivers: Move logic to all-packages.nix
Bring it in line with release.nix
-rw-r--r-- | nixos/tests/all-tests.nix | 19 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 11 insertions, 17 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5ef2a8a828048..0f75548ff6fda 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -27,21 +27,7 @@ let }; evalMinimalConfig = module: nixosLib.evalModules { modules = [ module ]; }; - allDrivers = getDrivers tests; - - getDrivers = ts: - if isDerivation ts - then ts.driver or null - else if isAttrs ts - then recurseIntoAttrs (mapAttrs (k: getDrivers) ts) - else null; - - tests = { - - # for typechecking of the scripts and evaluation of - # the nodes, without running VMs. - inherit allDrivers; - +in { _3proxy = handleTest ./3proxy.nix {}; acme = handleTest ./acme.nix {}; adguardhome = handleTest ./adguardhome.nix {}; @@ -634,5 +620,4 @@ let zookeeper = handleTest ./zookeeper.nix {}; zrepl = handleTest ./zrepl.nix {}; zsh-history = handleTest ./zsh-history.nix {}; -}; -in tests +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66c78c6783d25..22b4771414933 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -133,10 +133,19 @@ with pkgs; ### Push NixOS tests inside the fixed point + # See also allTestsForSystem in nixos/release.nix nixosTests = import ../../nixos/tests/all-tests.nix { inherit pkgs; system = stdenv.hostPlatform.system; callTest = t: t.test; + } // { + # for typechecking of the scripts and evaluation of + # the nodes, without running VMs. + allDrivers = import ../../nixos/tests/all-tests.nix { + inherit pkgs; + system = stdenv.hostPlatform.system; + callTest = t: t.test.driver; + }; }; ### BUILD SUPPORT |