Test tidy up

Author: hamishmack

test/cabal-simple-debug/default.nix

@@ -12,6 +12,9 @@ let
   packages = project.hsPkgs;
 
 in recurseIntoAttrs {
+  # DWARF only works on linux with GHC 8.10.2 and newer
+  meta.disabled = __elem compiler-nix-name ["ghc865" "ghc884"]
+    || !stdenv.hostPlatform.isLinux || haskellLib.isCrossHost || stdenv.hostPlatform.isMusl;
   ifdInputs = {
     inherit (project) plan-nix;
   };
@@ -34,9 +37,6 @@ in recurseIntoAttrs {
 
     meta = {
       platforms = platforms.all;
-      # DWARF only works on linux with GHC 8.10.2 and newer
-      disabled = compiler-nix-name == "ghc865" || compiler-nix-name == "ghc884"
-        || !stdenv.hostPlatform.isLinux || haskellLib.isCrossHost || stdenv.hostPlatform.isMusl;
     };
 
     passthru = {

test/default.nix

@@ -162,6 +162,7 @@ let
   # All tests.
   allTests = {
     cabal-simple = callTest ./cabal-simple { inherit util compiler-nix-name; };
+    cabal-simple-debug = callTest ./cabal-simple-debug { inherit util compiler-nix-name; };
     cabal-simple-prof = callTest ./cabal-simple-prof { inherit util compiler-nix-name; };
     cabal-sublib = callTest ./cabal-sublib { inherit util compiler-nix-name; };
     with-packages = callTest ./with-packages { inherit util; };
@@ -189,6 +190,8 @@ let
     hls-stack = callTest ./haskell-language-server/stack.nix { inherit compiler-nix-name; };
     cabal-hpack = callTest ./cabal-hpack { inherit util compiler-nix-name; };
     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) {
@@ -200,26 +203,17 @@ let
     # 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; };
-  } // lib.optionalAttrs (!stdenv.hostPlatform.isGhcjs) {
     # 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 (!stdenv.hostPlatform.isGhcjs && builtins.compareVersions pkgs.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "8.10" < 0) {
-    # Tha version of pandoc used in this test does not build with ghcjs or ghc 8.10 (lookup-sha256 and fully-static build pandoc)
-    lookup-sha256 = callTest ./lookup-sha256 { inherit compiler-nix-name; };
-    # fully-static = callTest ./fully-static { inherit (pkgs) buildPackages; };
   } // 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; };
-  } // lib.optionalAttrs (
-      stdenv.hostPlatform.isLinux && !pkgs.haskell-nix.haskellLib.isCrossHost && !stdenv.hostPlatform.isMusl
-      && !(__elem compiler-nix-name ["ghc865" "ghc884"])) {
-    cabal-simple-debug = callTest ./cabal-simple-debug { inherit util compiler-nix-name; };
   };
 
   # This is the same as allTests, but filter out all the key/vaules from the

test/lookup-sha256/default.nix

@@ -1,6 +1,11 @@
 { pkgs, lib, stdenv, haskell-nix, testSrc, zlib, compiler-nix-name } :
-  # A dependency is broken on windows, just run this on unix.
-  lib.addMetaAttrs { platforms = lib.platforms.unix; } ((haskell-nix.hackage-package {
+  lib.addMetaAttrs {
+    # A dependency is broken on windows, just run this on unix.
+    platforms = lib.platforms.unix;
+    # The version of pandoc used in this test does not build with ghcjs or ghc 8.10
+    disabled = stdenv.hostPlatform.isGhcjs
+      || builtins.compareVersions pkgs.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "8.10" >= 0;
+  } ((haskell-nix.hackage-package {
     inherit compiler-nix-name;
     name         = "pandoc";
     version      = "2.9.2.1";