diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-16 00:16:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-16 00:16:59 +0000 |
commit | 8ad29262293c6484aaf0232c300529d60dd01398 (patch) | |
tree | 8e38b116d27e16b103dcc297f863a0f0b9bc2f41 /pkgs/test | |
parent | de6a8565eea11dfe06a6ae4163d883c338b12037 (diff) | |
parent | f804cc939d80186b72506f5b23fe9f1e4764a1f4 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/test')
-rw-r--r-- | pkgs/test/cross/default.nix | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index a5144fe2cef66..f31d6aefbddab 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -107,10 +107,6 @@ let ''; }; -in { - gcc = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = false;})) tests); - llvm = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = true;})) tests); - # see https://github.com/NixOS/nixpkgs/issues/213453 # this is a good test of a lot of tricky glibc/libgcc corner cases mbuffer = let @@ -120,4 +116,34 @@ in { pkgs.runCommand "test-mbuffer" {} '' echo hello | ${emulator} ${mbuffer}/bin/mbuffer ''; + + # This is meant to be a carefully curated list of builds/packages + # that tend to break when refactoring our cross-compilation + # infrastructure. + # + # It should strike a balance between being small enough to fit in + # a single eval (i.e. not so large that hydra-eval-jobs is needed) + # so we can ask @ofborg to check it, yet should have good examples + # of things that often break. So, no buckshot `mapTestOnCross` + # calls here. + sanity = [ + #pkgs.mbuffer # https://github.com/NixOS/nixpkgs/issues/213453 + #pkgs.pkgsCross.gnu64.bash # https://github.com/NixOS/nixpkgs/issues/243164 + pkgs.gcc_multi.cc + pkgs.pkgsMusl.stdenv + pkgs.pkgsLLVM.stdenv + pkgs.pkgsStatic.bash + pkgs.pkgsCross.arm-embedded.stdenv + pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc + #pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc + pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv + pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv + pkgs.pkgsCross.mingwW64.stdenv + ]; + +in { + gcc = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = false;})) tests); + llvm = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = true;})) tests); + + inherit mbuffer sanity; } |