Skip to content

Commit

Permalink
Skip broken tests
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Nov 9, 2023
1 parent 9501873 commit 24529a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/shell-for/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, cabal-install, mkCabalProjectPkgSet, recurseIntoAttrs, runCommand, testSrc, compiler-nix-name, evalPackages }:
{ stdenv, lib, haskellLib, cabal-install, mkCabalProjectPkgSet, recurseIntoAttrs, runCommand, testSrc, compiler-nix-name, evalPackages }:

with lib;

Expand Down Expand Up @@ -54,7 +54,7 @@ let
in recurseIntoAttrs {
# Does not work on ghcjs because it needs zlib.
# Does not work on windows because it needs mintty.
meta.disabled = stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWindows
meta.disabled = stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWindows || (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64)
|| compiler-nix-name != ((import ./pkgs.nix).pkgs null).compiler.nix-name;
inherit env envPkga envDefault;
run = stdenv.mkDerivation {
Expand Down
2 changes: 2 additions & 0 deletions test/th-dlls/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ in recurseIntoAttrs {
meta.disabled = stdenv.hostPlatform.isGhcjs
# On aarch64 this test also breaks form musl builds (including cross compiles on x86_64-linux)
|| (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl)
# Failed to lookup symbol: __aarch64_swp8_acq_rel
|| (compiler-nix-name == "ghc947" && haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64)
;

ifdInputs = {
Expand Down

0 comments on commit 24529a5

Please sign in to comment.