From: Luke Lau <luke_lau@icloud.com>
Date: Thu, 17 Sep 2020 21:52:37 +0000 (+0100)
Subject: Merge pull request #76 from jneira/fix-win-hang
X-Git-Tag: 0.11.0.6~1
X-Git-Url: http://git.lukelau.me/?a=commitdiff_plain;h=0213715d81cfaf9c05bf3b9f3de5e1270cc95f15;hp=9e3fed2dcc329a123dcc3b9ca690aa7a84b9d5ea;p=lsp-test.git

Merge pull request #76 from jneira/fix-win-hang

Remove waitForProcess in finalizer
---

diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index 4b93e71..9e4aa81 100644
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -71,7 +71,10 @@ import Language.Haskell.LSP.Test.Exceptions
 import System.Console.ANSI
 import System.Directory
 import System.IO
-import System.Process (waitForProcess, ProcessHandle())
+import System.Process (ProcessHandle())
+#ifndef mingw32_HOST_OS
+import System.Process (waitForProcess)
+#endif
 import System.Timeout
 
 -- | A session representing one instance of launching and connecting to a server.
@@ -271,7 +274,10 @@ runSessionWithHandles serverIn serverOut serverProc serverHandler config caps ro
           -- handles etc via cleanupProcess
           killThread tid
           -- Give the server some time to exit cleanly
+          -- It makes the server hangs in windows so we have to avoid it
+#ifndef mingw32_HOST_OS
           timeout msgTimeoutMs (waitForProcess serverProc)
+#endif
           cleanupProcess server
 
   (result, _) <- bracket serverListenerLauncher