Skip to content

Commit 3b5b412

Browse files
committed
Skip failing tests
1 parent 266d280 commit 3b5b412

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

test/th-dlls/default.nix

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@ in recurseIntoAttrs {
2222
meta.disabled = stdenv.hostPlatform.isGhcjs
2323
# On aarch64 this test also breaks form musl builds (including cross compiles on x86_64-linux)
2424
|| (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl)
25-
# On for aarch64 cross compile on GHC 9.8.4 this test is fails sometimes for non profiled builds
26-
# (and always for the profiled builds).
27-
# This may be related to the memory allocation changes made in 9.8.4 that
28-
# replace the pool allocator patches we used in earlier versions.
29-
|| (compiler-nix-name == "ghc984" && stdenv.buildPlatform.isx86_64 && stdenv.hostPlatform.isAarch64)
3025
# Failed to lookup symbol: __aarch64_swp8_acq_rel
3126
|| (builtins.elem compiler-nix-name ["ghc947" "ghc948"] && haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64)
3227
# We have been unable to get windows cross compilation of th-orphans to work for GHC 8.10 using the latest nixpkgs
3328
|| (compiler-nix-name == "ghc8107" && stdenv.hostPlatform.isWindows)
34-
# We need to update GHC HEAD to get a version of ghc-internal compatible
35-
# with th-lift from head.hackage.
36-
|| builtins.elem compiler-nix-name [ "ghc91320241204" ]
3729
;
3830

3931
ifdInputs = {
4032
inherit (project true) plan-nix;
4133
};
4234

4335
build = packages.th-dlls.components.library;
44-
build-profiled = packages.th-dlls.components.library.profiled;
4536
just-template-haskell = packages.th-dlls.components.exes.just-template-haskell;
4637
build-ei = packages-ei.th-dlls.components.library;
47-
build-profiled-ei = packages-ei.th-dlls.components.library.profiled;
4838
just-template-haskell-ei = packages-ei.th-dlls.components.exes.just-template-haskell;
39+
} // optionalAttrs
40+
(!(builtins.elem compiler-nix-name ["ghc984" "ghc9121" "ghc912120241215x"] && stdenv.buildPlatform.isx86_64 && stdenv.hostPlatform.isAarch64)) {
41+
# On for aarch64 cross compile on GHC this test is fails sometimes for non profiled builds
42+
# (and always for the profiled builds).
43+
# This may be related to the memory allocation changes made in 9.8.4 that
44+
# replace the pool allocator patches we used in earlier versions.
45+
46+
# Interestingly GHC 9.10.1 and HEAD are wotking while 9.8.4 and 9.12 seem break.
47+
build-profiled = packages.th-dlls.components.library.profiled;
48+
build-profiled-ei = packages-ei.th-dlls.components.library.profiled;
4949
}

0 commit comments

Comments
 (0)