From cd466f1990ae0614c704a5567cd49a947a5cb238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dybiec?= <pawel@dybiec.info>
Date: Mon, 10 Jun 2024 10:20:49 +0100
Subject: [PATCH 1/2] Switch ghcide tests to sequential execution

---
 ghcide-test/exe/Main.hs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ghcide-test/exe/Main.hs b/ghcide-test/exe/Main.hs
index c8d927072c..8fc050ff6f 100644
--- a/ghcide-test/exe/Main.hs
+++ b/ghcide-test/exe/Main.hs
@@ -33,6 +33,7 @@ module Main (main) where
 import qualified HieDbRetry
 import           Test.Tasty
 import           Test.Tasty.Ingredients.Rerun
+import           Test.Tasty.Runners
 
 import           AsyncTests
 import           BootTests
@@ -70,7 +71,7 @@ import           WatchedFileTests
 main :: IO ()
 main = do
   -- We mess with env vars so run single-threaded.
-  defaultMainWithRerun $ testGroup "ghcide"
+  defaultMainWithRerun $ PlusTestOptions mkSequential $ testGroup "ghcide"
     [ OpenCloseTest.tests
     , InitializeResponseTests.tests
     , CompletionTests.tests
@@ -104,3 +105,6 @@ main = do
     , HieDbRetry.tests
     , ExceptionTests.tests
     ]
+    where
+       PlusTestOptions mkSequential _ =sequentialTestGroup "foo" AllFinish []
+

From e3caa91b638187caabe0088fa4993e084606ca32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dybiec?= <pawel@dybiec.info>
Date: Fri, 6 Jun 2025 18:04:32 +0100
Subject: [PATCH 2/2] Pin tasty 1.5 for ghcide tests

---
 haskell-language-server.cabal | 2 +-
 stack-lts22.yaml              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
index 157f5703f2..d756795e78 100644
--- a/haskell-language-server.cabal
+++ b/haskell-language-server.cabal
@@ -2110,7 +2110,7 @@ test-suite ghcide-tests
     , sqlite-simple
     , stm
     , stm-containers
-    , tasty
+    , tasty                  >=1.5
     , tasty-expected-failure
     , tasty-hunit             >=0.10
     , tasty-quickcheck
diff --git a/stack-lts22.yaml b/stack-lts22.yaml
index 8c5ba4364c..d9136bb294 100644
--- a/stack-lts22.yaml
+++ b/stack-lts22.yaml
@@ -27,6 +27,7 @@ extra-deps:
   - lsp-types-2.3.0.0
   - monad-dijkstra-0.1.1.4 # 5
   - retrie-1.2.3
+  - tasty-1.5.3
 
   # stan and friends
   - stan-0.1.3.0