@@ -73,23 +73,11 @@ with pkgs;
7373
7474 ### Push NixOS tests inside the fixed point
7575
76− nixosTests =
77− let
78− # TODO(Ericson2314,ekleog): Check this will work correctly with cross-
79− system = builtins.currentSystem;
80− rawTests = (import ../../nixos/release.nix {
81− nixpkgs = pkgs;
82− }).tests;
83− testNames = builtins.attrNames rawTests;
84− filteredList = builtins.filter
85− (test: rawTests.${test} ? ${system})
86− testNames;
87− finalList = map
88− (test: { name = test; value = rawTests.${test}.${system}; })
89− filteredList;
90− finalTests = builtins.listToAttrs finalList;
91− in
92− finalTests;
76+ nixosTests = import ../../nixos/tests/all-tests.nix {
77+ inherit pkgs;
78+ system = stdenv.hostPlatform.system;
79+ callTest = t: t.test;
80+ };
9381
9482 ### BUILD SUPPORT
9583