Fix more tests

Author: hamishmack

test/cabal-hpack/package.yaml

@@ -25,10 +25,15 @@ executables:
   cabal-hpack:
     main:                Main.hs
     source-dirs:         app
-    ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
+    when:
+      - condition: arch(wasm32)
+        then:
+          ghc-options: []
+        else:
+          ghc-options:
+          - -threaded
+          - -rtsopts
+          - -with-rtsopts=-N
     dependencies:
     - cabal-hpack
 

test/cabal-simple-prof/default.nix

@@ -29,8 +29,7 @@ let
     .override (lib.optionalAttrs stdenv.hostPlatform.isAndroid { setupBuildFlags = ["--ghc-option=-optl-static" ]; });
 
 in recurseIntoAttrs {
-  # This test seeems to be broken on 8.6 and 8.8 and ghcjs
-  meta.disabled = compiler-nix-name == "ghc865" || compiler-nix-name == "ghc884" || stdenv.hostPlatform.isGhcjs;
+  meta.disabled = stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWasm;
   ifdInputs = {
     inherit (project) plan-nix;
   };

test/coverage/default.nix

@@ -26,8 +26,8 @@ let
   crossSuffix' = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isStatic) "-static" + crossSuffix;
 
 in recurseIntoAttrs ({
-  # Does not work on ghcjs because it needs zlib.
-  meta.disabled = stdenv.hostPlatform.isGhcjs
+  # Does not work on ghcjs because it needs zlib. Wasm needs network fixed.
+  meta.disabled = stdenv.hostPlatform.isGhcjs || stdenv.hostPlatfom.isWasm
     # For some reason the `.tix` file is not created on armv7a android (not sure why)
     || stdenv.hostPlatform.isAndroid && stdenv.hostPlatform.isAarch32;
   run = stdenv.mkDerivation {

test/ghc-options/test-ghc-options.cabal

@@ -16,5 +16,6 @@ executable test-ghc-options-exe
   main-is:           Main.hs
   build-depends:     base >=4.7 && <5, test-ghc-options
   hs-source-dirs:    app
-  ghc-options:       -threaded -rtsopts -with-rtsopts=-N
+  if !arch(wasm32)
+    ghc-options:       -threaded -rtsopts -with-rtsopts=-N
   default-language:  Haskell2010

test/ghcjs-overlay/default.nix

@@ -17,6 +17,9 @@ in recurseIntoAttrs {
   run = stdenv.mkDerivation {
     name = "ghcjs-overlay-test";
 
+    # Double conversion needs updating for wasm
+    meta.disabled = stdenv.hostPlatform.isWasm;
+
     buildCommand = ''
       exe="${packages.ghcjs-overlay-test.components.exes.ghcjs-overlay-test.exePath}"
       size=$(command stat --format '%s' "$exe")

test/plugin/default.nix

@@ -18,11 +18,11 @@ in recurseIntoAttrs {
     inherit (project) plan-nix;
   };
 
-  # Not sure why this breaks for ghc 8.10.7
   meta.disabled =
        builtins.elem compiler-nix-name [ "ghc91320250523" ]
     || stdenv.hostPlatform.isMusl
     || stdenv.hostPlatform.isGhcjs
+    || stdenv.hostPlatform.isWasm
     || stdenv.hostPlatform.isWindows
     || (haskellLib.isCrossHost && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32));
   build = packages.test.components.library;