Refactor test filtering

Author: hamishmack

test/cabal-22/default.nix

@@ -11,6 +11,10 @@ let
   packages = project.hsPkgs;
 
 in recurseIntoAttrs {
+  # When using ghcjs on darwin this test fails with
+  # ReferenceError: h$hs_clock_darwin_gettime is not defined
+  # https://github.com/input-output-hk/haskell.nix/issues/925
+  meta.disabled = stdenv.hostPlatform.isGhcjs;
   ifdInputs = {
     inherit (project) plan-nix;
   };

test/coverage-golden/default.nix

@@ -19,6 +19,8 @@ let
   exampleCoverageReport = exampleProject.cardanoShellHaskellPackages.projectCoverageReport;
 
 in recurseIntoAttrs ({
+  # Does not work on ghcjs because it needs zlib.
+  meta.disabled = stdenv.hostPlatform.isGhcjs;
   run = stdenv.mkDerivation {
     name = "coverage-golden-test";
 

test/coverage-no-libs/default.nix

@@ -20,6 +20,8 @@ let
   exeExt = stdenv.hostPlatform.extensions.executable;
 
 in recurseIntoAttrs ({
+  # Does not work on ghcjs because it needs zlib.
+  meta.disabled = stdenv.hostPlatform.isGhcjs;
   run = stdenv.mkDerivation {
     name = "coverage-test";
 

test/coverage/default.nix

@@ -24,6 +24,8 @@ let
   exeExt = stdenv.hostPlatform.extensions.executable;
 
 in recurseIntoAttrs ({
+  # Does not work on ghcjs because it needs zlib.
+  meta.disabled = stdenv.hostPlatform.isGhcjs;
   run = stdenv.mkDerivation {
     name = "coverage-test";
 

test/default.nix

@@ -192,28 +192,16 @@ let
     index-state = callTest ./index-state { inherit compiler-nix-name; };
     lookup-sha256 = callTest ./lookup-sha256 { inherit compiler-nix-name; };
     # fully-static = callTest ./fully-static { inherit (pkgs) buildPackages; };
-
-    unit = unitTests;
-  } // lib.optionalAttrs (!stdenv.hostPlatform.isGhcjs && !stdenv.hostPlatform.isWindows) {
-    # Does not work on ghcjs because it needs zlib.
-    # Does not work on windows because it needs mintty.
     shell-for = callTest ./shell-for {};
-  } // lib.optionalAttrs (!stdenv.hostPlatform.isGhcjs) {
-    # When using ghcjs on darwin this test fails with
-    # ReferenceError: h$hs_clock_darwin_gettime is not defined
-    # https://github.com/input-output-hk/haskell.nix/issues/925
     cabal-22 = callTest ./cabal-22 { inherit util compiler-nix-name; };
-    # These do not work on ghcjs because it needs zlib.
     coverage = callTest ./coverage { inherit compiler-nix-name; };
     coverage-golden = callTest ./coverage-golden { inherit compiler-nix-name;};
     coverage-no-libs = callTest ./coverage-no-libs { inherit compiler-nix-name; };
     snapshots = callTest ./snapshots {};
-  } // lib.optionalAttrs (!pkgs.haskell-nix.haskellLib.isCrossHost) {
-    # Haddock is not included with cross compilers currently
     sublib-docs = callTest ./sublib-docs { inherit util compiler-nix-name; };
-    # githash runs git from TH code and this needs a cross compiled git exe
-    # to work correctly.  Cross compiling git is currently brocken.
     githash = haskell-nix.callPackage ./githash { inherit compiler-nix-name; testSrc = testSrcWithGitDir; };
+
+    unit = unitTests;
   };
 
   # This is the same as allTests, but filter out all the key/vaules from the

test/githash/default.nix

@@ -42,7 +42,9 @@ let
     packages.githash-test.components.exes.githash-test;
 
 in recurseIntoAttrs {
-  meta.disabled = compiler-nix-name == "ghc901";
+  # githash runs git from TH code and this needs a cross compiled git exe
+  # to work correctly.  Cross compiling git is currently brocken.
+  meta.disabled = compiler-nix-name == "ghc901" || pkgs.haskell-nix.haskellLib.isCrossHost;
 
   ifdInputs = {
     inherit (project) plan-nix;

test/haskell-language-server/cabal.nix

@@ -8,6 +8,5 @@ in recurseIntoAttrs {
   build = project.getComponent "haskell-language-server:exe:haskell-language-server";
 
   # Haskell Language Server does not build for GHC 9 yet
-  meta.disabled = builtins.compareVersions
-    buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.0" >= 0;
+  meta.disabled = compiler-nix-name == "ghc901";
 }

test/haskell-language-server/stack.nix

@@ -25,6 +25,5 @@ in recurseIntoAttrs {
   build = project.hsPkgs.haskell-language-server.components.exes.haskell-language-server;
 
   # Haskell Language Server does not build for GHC 9 yet
-  meta.disabled = builtins.compareVersions
-    buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.0" >= 0;
+  meta.disabled = compiler-nix-name == "ghc901";
 }

test/shell-for/default.nix

@@ -51,6 +51,9 @@ 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;
   inherit env envPkga envDefault;
   run = stdenv.mkDerivation {
     name = "shell-for-test";
@@ -72,7 +75,6 @@ in recurseIntoAttrs {
 
     meta = {
       platforms = platforms.unix;
-      disabled = stdenv.hostPlatform.isMusl;
     };
 
     passthru = {

test/snapshots/default.nix

@@ -7,6 +7,8 @@ let
     (ps: with ps; [ conduit conduit-extra resourcet ]);
 
 in recurseIntoAttrs {
+  # Does not work on ghcjs because it needs zlib.
+  meta.disabled = stdenv.hostPlatform.isGhcjs;
   inherit env;
   run = stdenv.mkDerivation {
     name = "shell-for-test";

test/sublib-docs/default.nix

@@ -12,6 +12,8 @@ let
   packages = project.hsPkgs;
 
 in recurseIntoAttrs {
+  # Haddock is not included with cross compilers currently
+  meta.disabled = pkgs.haskell-nix.haskellLib.isCrossHost;
   ifdInputs = {
     inherit (project) plan-nix;
   };