Fix Tests

- Mark some additional tests with `withTH`, which should provide
  the test-wrapper logic.

- Improve the test drop logic.

nix/pkgs.nix

@@ -205,6 +205,9 @@ let
          packages.cardano-sl-binary   = withTH;
          packages.cardano-sl-node     = withTH;
          packages.cardano-sl-explorer = withTH;
+         packages.cardano-sl-cluster  = withTH;
+         packages.cardano-sl-x509     = withTH;
+         packages.cardano-sl-mnemonic = withTH;
          packages.math-functions    = withTH;
          packages.servant-swagger-ui = withTH;
          packages.servant-swagger-ui-redoc = withTH;

release.nix

@@ -106,23 +106,27 @@ let
       cardano-wallet               = supportedSystems;
     } skipPackages;
     # nix-tools toolchain: Tests
-    nix-tools.tests = lib.recursiveUpdate
-      (removeAttrs
+    nix-tools.tests =
+      removeAttrs
         (lib.mapAttrs (_: lib.mapAttrs (_: _: supportedSystems))
           (lib.filterAttrs (n: v: builtins.match ".*cardano-sl.*" n != null && v != null)
             iohkPkgs.nix-tools.tests))
-        skipPackages)
-      {
+        skipPackages;
+  };
+
+  # tests that are either broken or broken on some arch
+  broken-tests           = {
         # these two tests are broken on darwin and take forever.
         # thus we only test them on linux
         cardano-sl-chain.chain-test = [ "x86_64-linux" ];
         cardano-wallet.unit = [ "x86_64-linux" ];
-      };
-
   };
-
-  mapped-nix-tools       = mapTestOn                                    nix-tools-toolchain;
-  mapped-nix-tools-cross = mapTestOnCross lib.systems.examples.mingwW64 nix-tools-toolchain;
+  broken-tests-cross     = {
+        # This one does not complete on wine.
+        cardano-sl-db.db-test = [];
+  };
+  mapped-nix-tools       = mapTestOn                                    (lib.recursiveUpdate nix-tools-toolchain { nix-tools.tests = broken-tests; });
+  mapped-nix-tools-cross = mapTestOnCross lib.systems.examples.mingwW64 (lib.recursiveUpdate nix-tools-toolchain { nix-tools.tests = broken-tests-cross; });
 
   mapped-nix-tools'
     = lib.recursiveUpdate