Remove preCheck used for tests running in qemu (input-output-hk#2098)

* Remove preCheck used for tests running in qemu

Author: hamishmack

ci.nix

@@ -135,8 +135,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: pinnedNixpkgsSrc:
             # ghc = pkgs.haskell-nix.compiler.${compiler-nix-name};
             # TODO: look into making tools work when cross compiling
             # inherit (build) tools;
-          } // pkgs.lib.optionalAttrs (runTests && crossSystemName != "aarch64-multiplatform") {
-            # Tests are broken on aarch64 cross https://github.com/input-output-hk/haskell.nix/issues/513
+          } // pkgs.lib.optionalAttrs runTests {
             inherit (build) tests;
         })
         # GHCJS builds its own template haskell runner.

overlays/armv6l-linux.nix

@@ -18,13 +18,6 @@ final: prev:
           # iserv-proxy needs to come from the buildPackages, as it needs to run on the
           # build host.
           inherit (final.haskell-nix.iserv-proxy-exes.${config.compiler.nix-name}) iserv-proxy iserv-proxy-interpreter;
-          # we need to use openssl.bin here, because the .dll's are in the .bin expression.
-          extra-test-libs = [
-            # pkgs.rocksdb
-            pkgs.openssl.bin
-            pkgs.libffi
-            pkgs.gmp
-          ];
         } // {
           # we can perform testing of cross compiled test-suites by using wine.
           # Therefore let's enable doCrossCheck here!

overlays/linux-cross.nix

@@ -7,7 +7,6 @@
 , iserv-proxy
 , iserv-proxy-interpreter
 , gmp
-, extra-test-libs ? []
 , buildPlatform
 , hostPlatform
 , ...
@@ -47,21 +46,6 @@ let
     '';
   testWrapper = lib.optional isLinuxCross "${qemuTestWrapper}/bin/test-wrapper";
 
-  preCheck = lib.optionalString isLinuxCross ''
-    echo "================================================================="
-    echo "RUNNING TESTS for $name via qemu-${qemuSuffix}"
-    echo "================================================================="
-    echo "Copying extra test libraries"
-    for p in ${lib.concatStringsSep " " extra-test-libs}; do
-      find "$p" -iname '*.so*' -exec cp {} . \;
-    done
-  '';
-  postCheck = lib.optionalString isLinuxCross ''
-    echo "================================================================="
-    echo "END RUNNING TESTS"
-    echo "================================================================="
-  '';
-
   enableShared = lib.mkDefault (!isLinuxCross);
 
-in { inherit preCheck postCheck configureFlags setupBuildFlags testWrapper enableShared; }
+in { inherit configureFlags setupBuildFlags testWrapper enableShared; }