cross/tests: add llvm-based tests

1 files changed, 25 insertions, 21 deletions

diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index a907b9e2d45..5d9c120c501 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -53,10 +53,10 @@ let
     fi
   '';
 
-  mapMultiPlatformTest = test: lib.mapAttrs (name: system: test rec {
+  mapMultiPlatformTest = crossSystemFun: test: lib.mapAttrs (name: system: test rec {
     crossPkgs = import pkgs.path {
       localSystem = { inherit (pkgs.hostPlatform) config; };
-      crossSystem = system;
+      crossSystem = crossSystemFun system;
     };
 
     emulator = crossPkgs.hostPlatform.emulator pkgs;
@@ -71,26 +71,30 @@ let
       } else pkg;
   }) testedSystems;
 
-in
-
-lib.mapAttrs (_: mapMultiPlatformTest) {
+  tests = {
+
+    file = {platformFun, crossPkgs, emulator}: compareTest {
+      inherit emulator crossPkgs;
+      hostPkgs = pkgs;
+      exec = "/bin/file";
+      args = [
+        "${pkgs.file}/share/man/man1/file.1.gz"
+        "${pkgs.dejavu_fonts}/share/fonts/truetype/DejaVuMathTeXGyre.ttf"
+      ];
+      pkgFun = pkgs: platformFun pkgs.file;
+    };
 
-  file = {platformFun, crossPkgs, emulator}: compareTest {
-    inherit emulator crossPkgs;
-    hostPkgs = pkgs;
-    exec = "/bin/file";
-    args = [
-      "${pkgs.file}/share/man/man1/file.1.gz"
-      "${pkgs.dejavu_fonts}/share/fonts/truetype/DejaVuMathTeXGyre.ttf"
-    ];
-    pkgFun = pkgs: platformFun pkgs.file;
-  };
+    hello = {platformFun, crossPkgs, emulator}: compareTest {
+      inherit emulator crossPkgs;
+      hostPkgs = pkgs;
+      exec = "/bin/hello";
+      pkgFun = pkgs: pkgs.hello;
+    };
 
-  hello = {platformFun, crossPkgs, emulator}: compareTest {
-    inherit emulator crossPkgs;
-    hostPkgs = pkgs;
-    exec = "/bin/hello";
-    pkgFun = pkgs: pkgs.hello;
   };
 
-}
+in (lib.mapAttrs (_: mapMultiPlatformTest builtins.id) tests)
+// (lib.mapAttrs' (name: test: {
+    name = "${name}-llvm";
+    value = mapMultiPlatformTest (system: system // {useLLVM = true;}) test;
+  }) tests)