Skip to content

Commit 97ef998

Browse files
authored
Remove the preCheck for windows tests (input-output-hk#2099)
* Remove the `preCheck` for windows tests This was copying DLLs need into place. I don't think this is needed any more because it DLLs are copied into the `/bin` directory of the test derivation by the `installPhase` in `builder/comp-builder.nix`. * Remove preCheck and postCheck
1 parent c1036ce commit 97ef998

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

overlays/mingw_w64.nix

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -98,24 +98,4 @@ let
9898
'';
9999
testWrapper = lib.optional hostPlatform.isWindows "${wineTestWrapper}/bin/test-wrapper";
100100

101-
preCheck = lib.optionalString hostPlatform.isWindows ''
102-
echo "================================================================================"
103-
echo "RUNNING TESTS for $name via wine64"
104-
echo "================================================================================"
105-
# copy all .dlls into the local directory.
106-
# we ask ghc-pkg for *all* dynamic-library-dirs and then iterate over the unique set
107-
# to copy over dlls as needed.
108-
echo "Copying library dependencies..."
109-
for libdir in $(${hostPlatform.config}-ghc-pkg field "*" dynamic-library-dirs --simple-output|xargs|sed 's/ /\n/g'|sort -u); do
110-
if [ -d "$libdir" ]; then
111-
find "$libdir" -iname '*.dll' -exec cp {} . \;
112-
fi
113-
done
114-
'';
115-
postCheck = lib.optionalString hostPlatform.isWindows ''
116-
echo "================================================================================"
117-
echo "END RUNNING TESTS"
118-
echo "================================================================================"
119-
'';
120-
121-
in { inherit preCheck testWrapper postCheck setupBuildFlags configureFlags; }
101+
in { inherit testWrapper setupBuildFlags configureFlags; }

0 commit comments

Comments
 (0)