tests: refactor outputs

Reduce redundant imports and group at higher level available for use in
more outputs.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>

tests/flake.nix

@@ -26,15 +26,13 @@
         "x86_64-linux"
       ];
 
-      ciTestChunks =
+      testChunks =
         system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
           inherit (pkgs) lib;
 
           # Create chunked test packages for better CI parallelization
-          testChunks =
-            let
           tests = import ./. {
             inherit pkgs;
             # Disable big tests since this is only used for CI
@@ -69,66 +67,72 @@
             i: lib.nameValuePair "test-chunk-${toString (i + 1)}" (makeChunk (i + 1) filteredTests)
           ) numChunks
         );
-        in
-        testChunks;
 
-      allPackagesAndTests =
+      integrationTests =
         system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
           inherit (pkgs) lib;
-
+        in
-          renamedBuildTests =
+        lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux (
           let
+            tests = import ./integration { inherit pkgs lib; };
+            renameTestPkg = n: v: lib.nameValuePair "integration-${n}" v;
+          in
+          lib.mapAttrs' renameTestPkg (lib.removeAttrs tests [ "all" ])
+        );
+
+      # Test group definitions
+      buildTests =
+        system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
           tests = import ./. { inherit pkgs; };
-              renameTestPkg = n: lib.nameValuePair "test-${n}";
+          renameTestPkg = n: nixpkgs.lib.nameValuePair "test-${n}";
         in
-            lib.mapAttrs' renameTestPkg tests.build;
+        nixpkgs.lib.mapAttrs' renameTestPkg tests.build;
 
-          integrationTestPackages =
+      buildTestsNoBig =
-            let
+        system:
-              tests = import ./integration {
-                inherit pkgs;
-                inherit (pkgs) lib;
-              };
-              renameTestPkg = n: lib.nameValuePair "integration-test-${n}";
-            in
-            lib.mapAttrs' renameTestPkg tests;
-
-          # Aggregate test set without big tests
-          testAllNoBig =
         let
+          pkgs = nixpkgs.legacyPackages.${system};
           tests = import ./. {
             inherit pkgs;
             enableBig = false;
           };
         in
-            lib.nameValuePair "test-all-no-big" tests.build.all;
+        {
+          test-all-no-big = tests.build.all;
+        };
 
-          # Aggregate test set without big tests, with legacy IFD
+      buildTestsNoBigIfd =
-          testAllNoBigIfd =
+        system:
         let
+          pkgs = nixpkgs.legacyPackages.${system};
           tests = import ./. {
             inherit pkgs;
             enableBig = false;
             enableLegacyIfd = true;
           };
         in
-            lib.nameValuePair "test-all-no-big-ifd" tests.build.all;
+        {
+          test-all-no-big-ifd = tests.build.all;
+        };
+
+      integrationTestPackages =
+        system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+          inherit (pkgs) lib;
+          tests = import ./integration { inherit pkgs lib; };
+          renameTestPkg = n: lib.nameValuePair "integration-test-${n}";
         in
-        # Merge all the packages and tests meant for the 'packages' output
+        lib.mapAttrs' renameTestPkg tests;
-        renamedBuildTests
-        // integrationTestPackages
-        // (lib.listToAttrs [
-          testAllNoBig
-          testAllNoBigIfd
-        ])
-        // (ciTestChunks system);
 
     in
     {
       # TODO: increase buildbot testing scope
-      buildbot = forCI ciTestChunks;
+      buildbot = forCI (system: (testChunks system));
 
       devShells = forAllSystems (
         system:
@@ -139,6 +143,14 @@
         tests.run
       );
 
-      packages = forAllSystems allPackagesAndTests;
+      packages = forAllSystems (
+        system:
+        (buildTests system)
+        // (integrationTestPackages system)
+        // (buildTestsNoBig system)
+        // (buildTestsNoBigIfd system)
+        // (testChunks system)
+        // (integrationTests system)
+      );
     };
 }