Skip to content

Commit 89631a7

Browse files
committed
Skip some broken tests
1 parent 60f40bd commit 89631a7

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

ci.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: pinnedNixpkgsSrc:
165165
inherit (build) tests;
166166
})
167167
# GHCJS builds its own template haskell runner.
168-
// pkgs.lib.optionalAttrs (ifdLevel >= 2 && crossSystemName != "ghcjs")
168+
// pkgs.lib.optionalAttrs (ifdLevel >= 2 && !builtins.elem crossSystemName ["ghcjs" "wasi32"])
169169
pkgs.haskell-nix.iserv-proxy-exes.${compiler-nix-name}
170170
// pkgs.lib.optionalAttrs (ifdLevel >= 3) {
171171
hello = (pkgs.haskell-nix.hackage-package { name = "hello"; version = "1.0.0.2"; inherit evalPackages compiler-nix-name; }).getComponent "exe:hello";

test/annotations/default.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ let
99
};
1010

1111
in recurseIntoAttrs {
12-
meta.disabled = stdenv.hostPlatform.isGhcjs
12+
meta.disabled =
13+
# This fail looking for ghci. Adding ghci as a `build-depends` works, but should not be needed
14+
stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWasm
1315
# Failed to lookup symbol: __aarch64_swp8_acq_rel
1416
|| (builtins.elem compiler-nix-name ["ghc947" "ghc948"] && haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64)
1517
# unhandled ELF relocation(Rel) type 10

test/cabal-22/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ in recurseIntoAttrs {
1616
# ReferenceError: h$hs_clock_darwin_gettime is not defined
1717
# https://github.com/input-output-hk/haskell.nix/issues/925
1818
# Also `hspec` now depends on `ghc`, which breaks this test for cross compilation
19-
meta.disabled = stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isMusl;
19+
meta.disabled = stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWasm || stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isMusl;
2020
ifdInputs = {
2121
inherit (project) plan-nix;
2222
};

0 commit comments

Comments
 (0)