haskell · fendor · Mar 19, 2025 · Mar 17, 2025 · Mar 17, 2025 · Mar 17, 2025
diff --git a/ghcide-bench/src/Experiments.hs b/ghcide-bench/src/Experiments.hs
@@ -342,7 +342,7 @@
 examplesPath = "bench/example"

 defConfig :: Config
 Success defConfig = execParserPure defaultPrefs (info configP fullDesc) []

 quiet, verbose :: Config -> Bool
 verbose = (== All) . verbosity
@@ -857,11 +857,9 @@
 getRebuildsCount :: Session (Either (TResponseError @ClientToServer (Method_CustomMethod "test")) Int)
 getRebuildsCount = tryCallTestPlugin GetRebuildsCount
 
--- Copy&paste from ghcide/test/Development.IDE.Test
 getStoredKeys :: Session [Text]
 getStoredKeys = callTestPlugin GetStoredKeys
 
--- Copy&paste from ghcide/test/Development.IDE.Test
 tryCallTestPlugin :: (A.FromJSON b) => TestRequest -> Session (Either (TResponseError @ClientToServer (Method_CustomMethod "test")) b)
 tryCallTestPlugin cmd = do
     let cm = SMethod_CustomMethod (Proxy @"test")
@@ -873,7 +871,6 @@
              A.Success a -> Right a
              A.Error e   -> error e
 
--- Copy&paste from ghcide/test/Development.IDE.Test
 callTestPlugin :: (A.FromJSON b) => TestRequest -> Session b
 callTestPlugin cmd = do
     res <- tryCallTestPlugin cmd

diff --git a/ghcide/test/LICENSE → ghcide-test/LICENSE b/ghcide/test/LICENSE → ghcide-test/LICENSE
diff --git a/ghcide/test/data/TH/THA.hs → ghcide-test/data/TH/THA.hs b/ghcide/test/data/TH/THA.hs → ghcide-test/data/TH/THA.hs
diff --git a/ghcide/test/data/TH/THB.hs → ghcide-test/data/TH/THB.hs b/ghcide/test/data/TH/THB.hs → ghcide-test/data/TH/THB.hs
diff --git a/ghcide/test/data/TH/THC.hs → ghcide-test/data/TH/THC.hs b/ghcide/test/data/TH/THC.hs → ghcide-test/data/TH/THC.hs
diff --git a/ghcide/test/data/TH/hie.yaml → ghcide-test/data/TH/hie.yaml b/ghcide/test/data/TH/hie.yaml → ghcide-test/data/TH/hie.yaml
diff --git a/ghcide/test/data/THCoreFile/THA.hs → ghcide-test/data/THCoreFile/THA.hs b/ghcide/test/data/THCoreFile/THA.hs → ghcide-test/data/THCoreFile/THA.hs
diff --git a/ghcide/test/data/THCoreFile/THB.hs → ghcide-test/data/THCoreFile/THB.hs b/ghcide/test/data/THCoreFile/THB.hs → ghcide-test/data/THCoreFile/THB.hs
diff --git a/ghcide/test/data/THCoreFile/THC.hs → ghcide-test/data/THCoreFile/THC.hs b/ghcide/test/data/THCoreFile/THC.hs → ghcide-test/data/THCoreFile/THC.hs
diff --git a/ghcide/test/data/THCoreFile/hie.yaml → ghcide-test/data/THCoreFile/hie.yaml b/ghcide/test/data/THCoreFile/hie.yaml → ghcide-test/data/THCoreFile/hie.yaml
diff --git a/ghcide/test/data/THLoading/A.hs → ghcide-test/data/THLoading/A.hs b/ghcide/test/data/THLoading/A.hs → ghcide-test/data/THLoading/A.hs
diff --git a/ghcide/test/data/THLoading/B.hs → ghcide-test/data/THLoading/B.hs b/ghcide/test/data/THLoading/B.hs → ghcide-test/data/THLoading/B.hs
diff --git a/ghcide/test/data/THLoading/THA.hs → ghcide-test/data/THLoading/THA.hs b/ghcide/test/data/THLoading/THA.hs → ghcide-test/data/THLoading/THA.hs
diff --git a/ghcide/test/data/THLoading/THB.hs → ghcide-test/data/THLoading/THB.hs b/ghcide/test/data/THLoading/THB.hs → ghcide-test/data/THLoading/THB.hs
diff --git a/ghcide/test/data/THLoading/hie.yaml → ghcide-test/data/THLoading/hie.yaml b/ghcide/test/data/THLoading/hie.yaml → ghcide-test/data/THLoading/hie.yaml
diff --git a/ghcide/test/data/THNewName/A.hs → ghcide-test/data/THNewName/A.hs b/ghcide/test/data/THNewName/A.hs → ghcide-test/data/THNewName/A.hs
diff --git a/ghcide/test/data/THNewName/B.hs → ghcide-test/data/THNewName/B.hs b/ghcide/test/data/THNewName/B.hs → ghcide-test/data/THNewName/B.hs
diff --git a/ghcide/test/data/THNewName/C.hs → ghcide-test/data/THNewName/C.hs b/ghcide/test/data/THNewName/C.hs → ghcide-test/data/THNewName/C.hs
diff --git a/ghcide/test/data/THNewName/hie.yaml → ghcide-test/data/THNewName/hie.yaml b/ghcide/test/data/THNewName/hie.yaml → ghcide-test/data/THNewName/hie.yaml
diff --git a/ghcide/test/data/THUnboxed/THA.hs → ghcide-test/data/THUnboxed/THA.hs b/ghcide/test/data/THUnboxed/THA.hs → ghcide-test/data/THUnboxed/THA.hs
diff --git a/ghcide/test/data/THUnboxed/THB.hs → ghcide-test/data/THUnboxed/THB.hs b/ghcide/test/data/THUnboxed/THB.hs → ghcide-test/data/THUnboxed/THB.hs
diff --git a/ghcide/test/data/THUnboxed/THC.hs → ghcide-test/data/THUnboxed/THC.hs b/ghcide/test/data/THUnboxed/THC.hs → ghcide-test/data/THUnboxed/THC.hs
diff --git a/ghcide/test/data/THUnboxed/hie.yaml → ghcide-test/data/THUnboxed/hie.yaml b/ghcide/test/data/THUnboxed/hie.yaml → ghcide-test/data/THUnboxed/hie.yaml
diff --git a/ghcide/test/data/boot/A.hs → ghcide-test/data/boot/A.hs b/ghcide/test/data/boot/A.hs → ghcide-test/data/boot/A.hs
diff --git a/ghcide/test/data/boot/A.hs-boot → ghcide-test/data/boot/A.hs-boot b/ghcide/test/data/boot/A.hs-boot → ghcide-test/data/boot/A.hs-boot
diff --git a/ghcide/test/data/boot/B.hs → ghcide-test/data/boot/B.hs b/ghcide/test/data/boot/B.hs → ghcide-test/data/boot/B.hs
diff --git a/ghcide/test/data/boot/C.hs → ghcide-test/data/boot/C.hs b/ghcide/test/data/boot/C.hs → ghcide-test/data/boot/C.hs
diff --git a/ghcide/test/data/boot/hie.yaml → ghcide-test/data/boot/hie.yaml b/ghcide/test/data/boot/hie.yaml → ghcide-test/data/boot/hie.yaml
diff --git a/ghcide/test/data/boot2/A.hs → ghcide-test/data/boot2/A.hs b/ghcide/test/data/boot2/A.hs → ghcide-test/data/boot2/A.hs
diff --git a/ghcide/test/data/boot2/B.hs → ghcide-test/data/boot2/B.hs b/ghcide/test/data/boot2/B.hs → ghcide-test/data/boot2/B.hs
diff --git a/ghcide/test/data/boot2/B.hs-boot → ghcide-test/data/boot2/B.hs-boot b/ghcide/test/data/boot2/B.hs-boot → ghcide-test/data/boot2/B.hs-boot
diff --git a/ghcide/test/data/boot2/C.hs → ghcide-test/data/boot2/C.hs b/ghcide/test/data/boot2/C.hs → ghcide-test/data/boot2/C.hs
diff --git a/ghcide/test/data/boot2/D.hs → ghcide-test/data/boot2/D.hs b/ghcide/test/data/boot2/D.hs → ghcide-test/data/boot2/D.hs
diff --git a/ghcide/test/data/boot2/E.hs → ghcide-test/data/boot2/E.hs b/ghcide/test/data/boot2/E.hs → ghcide-test/data/boot2/E.hs
diff --git a/ghcide/test/data/boot2/hie.yaml → ghcide-test/data/boot2/hie.yaml b/ghcide/test/data/boot2/hie.yaml → ghcide-test/data/boot2/hie.yaml
diff --git a/ghcide/test/data/cabal-exe/a/a.cabal → ghcide-test/data/cabal-exe/a/a.cabal b/ghcide/test/data/cabal-exe/a/a.cabal → ghcide-test/data/cabal-exe/a/a.cabal
diff --git a/ghcide/test/data/cabal-exe/a/src/Main.hs → ghcide-test/data/cabal-exe/a/src/Main.hs b/ghcide/test/data/cabal-exe/a/src/Main.hs → ghcide-test/data/cabal-exe/a/src/Main.hs
diff --git a/ghcide/test/data/cabal-exe/hie.yaml → ghcide-test/data/cabal-exe/hie.yaml b/ghcide/test/data/cabal-exe/hie.yaml → ghcide-test/data/cabal-exe/hie.yaml
diff --git a/ghcide/test/data/hover/Bar.hs → ghcide-test/data/hover/Bar.hs b/ghcide/test/data/hover/Bar.hs → ghcide-test/data/hover/Bar.hs
diff --git a/ghcide/test/data/hover/Foo.hs → ghcide-test/data/hover/Foo.hs b/ghcide/test/data/hover/Foo.hs → ghcide-test/data/hover/Foo.hs
diff --git a/ghcide/test/data/hover/GotoHover.hs → ghcide-test/data/hover/GotoHover.hs b/ghcide/test/data/hover/GotoHover.hs → ghcide-test/data/hover/GotoHover.hs
diff --git a/ghcide/test/data/hover/GotoImplementation.hs → ghcide-test/data/hover/GotoImplementation.hs b/ghcide/test/data/hover/GotoImplementation.hs → ghcide-test/data/hover/GotoImplementation.hs
diff --git a/ghcide/test/data/hover/RecordDotSyntax.hs → ghcide-test/data/hover/RecordDotSyntax.hs b/ghcide/test/data/hover/RecordDotSyntax.hs → ghcide-test/data/hover/RecordDotSyntax.hs
diff --git a/ghcide/test/data/hover/hie.yaml → ghcide-test/data/hover/hie.yaml b/ghcide/test/data/hover/hie.yaml → ghcide-test/data/hover/hie.yaml
diff --git a/ghcide/test/data/ignore-fatal/IgnoreFatal.hs → ghcide-test/data/ignore-fatal/IgnoreFatal.hs b/ghcide/test/data/ignore-fatal/IgnoreFatal.hs → ghcide-test/data/ignore-fatal/IgnoreFatal.hs
diff --git a/ghcide/test/data/ignore-fatal/hie.yaml → ghcide-test/data/ignore-fatal/hie.yaml b/ghcide/test/data/ignore-fatal/hie.yaml → ghcide-test/data/ignore-fatal/hie.yaml
diff --git a/...test/data/ignore-fatal/ignore-fatal.cabal → ...test/data/ignore-fatal/ignore-fatal.cabal b/...test/data/ignore-fatal/ignore-fatal.cabal → ...test/data/ignore-fatal/ignore-fatal.cabal
diff --git a/.../data/multi-unit-reexport/a-1.0.0-inplace → .../data/multi-unit-reexport/a-1.0.0-inplace b/.../data/multi-unit-reexport/a-1.0.0-inplace → .../data/multi-unit-reexport/a-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit-reexport/a/A.hs → ghcide-test/data/multi-unit-reexport/a/A.hs b/ghcide/test/data/multi-unit-reexport/a/A.hs → ghcide-test/data/multi-unit-reexport/a/A.hs
diff --git a/.../data/multi-unit-reexport/b-1.0.0-inplace → .../data/multi-unit-reexport/b-1.0.0-inplace b/.../data/multi-unit-reexport/b-1.0.0-inplace → .../data/multi-unit-reexport/b-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit-reexport/b/B.hs → ghcide-test/data/multi-unit-reexport/b/B.hs b/ghcide/test/data/multi-unit-reexport/b/B.hs → ghcide-test/data/multi-unit-reexport/b/B.hs
diff --git a/.../data/multi-unit-reexport/c-1.0.0-inplace → .../data/multi-unit-reexport/c-1.0.0-inplace b/.../data/multi-unit-reexport/c-1.0.0-inplace → .../data/multi-unit-reexport/c-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit-reexport/c/C.hs → ghcide-test/data/multi-unit-reexport/c/C.hs b/ghcide/test/data/multi-unit-reexport/c/C.hs → ghcide-test/data/multi-unit-reexport/c/C.hs
diff --git a/...de/test/data/multi-unit-reexport/hie.yaml → ...de-test/data/multi-unit-reexport/hie.yaml b/...de/test/data/multi-unit-reexport/hie.yaml → ...de-test/data/multi-unit-reexport/hie.yaml
diff --git a/ghcide/test/data/multi-unit/a-1.0.0-inplace → ghcide-test/data/multi-unit/a-1.0.0-inplace b/ghcide/test/data/multi-unit/a-1.0.0-inplace → ghcide-test/data/multi-unit/a-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit/a/A.hs → ghcide-test/data/multi-unit/a/A.hs b/ghcide/test/data/multi-unit/a/A.hs → ghcide-test/data/multi-unit/a/A.hs
diff --git a/ghcide/test/data/multi-unit/b-1.0.0-inplace → ghcide-test/data/multi-unit/b-1.0.0-inplace b/ghcide/test/data/multi-unit/b-1.0.0-inplace → ghcide-test/data/multi-unit/b-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit/b/B.hs → ghcide-test/data/multi-unit/b/B.hs b/ghcide/test/data/multi-unit/b/B.hs → ghcide-test/data/multi-unit/b/B.hs
diff --git a/ghcide/test/data/multi-unit/c-1.0.0-inplace → ghcide-test/data/multi-unit/c-1.0.0-inplace b/ghcide/test/data/multi-unit/c-1.0.0-inplace → ghcide-test/data/multi-unit/c-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit/c/C.hs → ghcide-test/data/multi-unit/c/C.hs b/ghcide/test/data/multi-unit/c/C.hs → ghcide-test/data/multi-unit/c/C.hs
diff --git a/ghcide/test/data/multi-unit/hie.yaml → ghcide-test/data/multi-unit/hie.yaml b/ghcide/test/data/multi-unit/hie.yaml → ghcide-test/data/multi-unit/hie.yaml
diff --git a/ghcide/test/data/multi/a/A.hs → ghcide-test/data/multi/a/A.hs b/ghcide/test/data/multi/a/A.hs → ghcide-test/data/multi/a/A.hs
diff --git a/ghcide/test/data/multi/a/a.cabal → ghcide-test/data/multi/a/a.cabal b/ghcide/test/data/multi/a/a.cabal → ghcide-test/data/multi/a/a.cabal
diff --git a/ghcide/test/data/multi/b/B.hs → ghcide-test/data/multi/b/B.hs b/ghcide/test/data/multi/b/B.hs → ghcide-test/data/multi/b/B.hs
diff --git a/ghcide/test/data/multi/b/b.cabal → ghcide-test/data/multi/b/b.cabal b/ghcide/test/data/multi/b/b.cabal → ghcide-test/data/multi/b/b.cabal
diff --git a/ghcide/test/data/multi/c/C.hs → ghcide-test/data/multi/c/C.hs b/ghcide/test/data/multi/c/C.hs → ghcide-test/data/multi/c/C.hs
diff --git a/ghcide/test/data/multi/c/c.cabal → ghcide-test/data/multi/c/c.cabal b/ghcide/test/data/multi/c/c.cabal → ghcide-test/data/multi/c/c.cabal
diff --git a/ghcide/test/data/multi/hie.yaml → ghcide-test/data/multi/hie.yaml b/ghcide/test/data/multi/hie.yaml → ghcide-test/data/multi/hie.yaml
diff --git a/ghcide/test/data/plugin-knownnat/KnownNat.hs → ghcide-test/data/plugin-knownnat/KnownNat.hs b/ghcide/test/data/plugin-knownnat/KnownNat.hs → ghcide-test/data/plugin-knownnat/KnownNat.hs
diff --git a/...de/test/data/plugin-knownnat/plugin.cabal → ...de-test/data/plugin-knownnat/plugin.cabal b/...de/test/data/plugin-knownnat/plugin.cabal → ...de-test/data/plugin-knownnat/plugin.cabal
diff --git a/ghcide/test/data/recomp/A.hs → ghcide-test/data/recomp/A.hs b/ghcide/test/data/recomp/A.hs → ghcide-test/data/recomp/A.hs
diff --git a/ghcide/test/data/recomp/B.hs → ghcide-test/data/recomp/B.hs b/ghcide/test/data/recomp/B.hs → ghcide-test/data/recomp/B.hs
diff --git a/ghcide/test/data/recomp/P.hs → ghcide-test/data/recomp/P.hs b/ghcide/test/data/recomp/P.hs → ghcide-test/data/recomp/P.hs
diff --git a/ghcide/test/data/recomp/hie.yaml → ghcide-test/data/recomp/hie.yaml b/ghcide/test/data/recomp/hie.yaml → ghcide-test/data/recomp/hie.yaml
diff --git a/ghcide/test/data/references/Main.hs → ghcide-test/data/references/Main.hs b/ghcide/test/data/references/Main.hs → ghcide-test/data/references/Main.hs
diff --git a/ghcide/test/data/references/OtherModule.hs → ghcide-test/data/references/OtherModule.hs b/ghcide/test/data/references/OtherModule.hs → ghcide-test/data/references/OtherModule.hs
diff --git a/.../test/data/references/OtherOtherModule.hs → ...-test/data/references/OtherOtherModule.hs b/.../test/data/references/OtherOtherModule.hs → ...-test/data/references/OtherOtherModule.hs
diff --git a/ghcide/test/data/references/References.hs → ghcide-test/data/references/References.hs b/ghcide/test/data/references/References.hs → ghcide-test/data/references/References.hs
diff --git a/ghcide/test/data/references/hie.yaml → ghcide-test/data/references/hie.yaml b/ghcide/test/data/references/hie.yaml → ghcide-test/data/references/hie.yaml
diff --git a/ghcide/test/data/rootUri/dirA/Foo.hs → ghcide-test/data/rootUri/dirA/Foo.hs b/ghcide/test/data/rootUri/dirA/Foo.hs → ghcide-test/data/rootUri/dirA/Foo.hs
diff --git a/ghcide/test/data/rootUri/dirA/foo.cabal → ghcide-test/data/rootUri/dirA/foo.cabal b/ghcide/test/data/rootUri/dirA/foo.cabal → ghcide-test/data/rootUri/dirA/foo.cabal
diff --git a/ghcide/test/data/rootUri/dirB/Foo.hs → ghcide-test/data/rootUri/dirB/Foo.hs b/ghcide/test/data/rootUri/dirB/Foo.hs → ghcide-test/data/rootUri/dirB/Foo.hs
diff --git a/ghcide/test/data/rootUri/dirB/foo.cabal → ghcide-test/data/rootUri/dirB/foo.cabal b/ghcide/test/data/rootUri/dirB/foo.cabal → ghcide-test/data/rootUri/dirB/foo.cabal
diff --git a/ghcide/test/data/symlink/hie.yaml → ghcide-test/data/symlink/hie.yaml b/ghcide/test/data/symlink/hie.yaml → ghcide-test/data/symlink/hie.yaml
diff --git a/ghcide/test/data/symlink/other_loc/.gitkeep → ghcide-test/data/symlink/other_loc/.gitkeep b/ghcide/test/data/symlink/other_loc/.gitkeep → ghcide-test/data/symlink/other_loc/.gitkeep
diff --git a/ghcide/test/data/symlink/some_loc/Sym.hs → ghcide-test/data/symlink/some_loc/Sym.hs b/ghcide/test/data/symlink/some_loc/Sym.hs → ghcide-test/data/symlink/some_loc/Sym.hs
diff --git a/ghcide/test/data/symlink/src/Foo.hs → ghcide-test/data/symlink/src/Foo.hs b/ghcide/test/data/symlink/src/Foo.hs → ghcide-test/data/symlink/src/Foo.hs
diff --git a/ghcide/test/data/working-dir/a/A.hs → ghcide-test/data/working-dir/a/A.hs b/ghcide/test/data/working-dir/a/A.hs → ghcide-test/data/working-dir/a/A.hs
diff --git a/ghcide/test/data/working-dir/a/B.hs → ghcide-test/data/working-dir/a/B.hs b/ghcide/test/data/working-dir/a/B.hs → ghcide-test/data/working-dir/a/B.hs
diff --git a/ghcide/test/data/working-dir/a/a.cabal → ghcide-test/data/working-dir/a/a.cabal b/ghcide/test/data/working-dir/a/a.cabal → ghcide-test/data/working-dir/a/a.cabal
diff --git a/ghcide/test/data/working-dir/a/wdtest → ghcide-test/data/working-dir/a/wdtest b/ghcide/test/data/working-dir/a/wdtest → ghcide-test/data/working-dir/a/wdtest
diff --git a/ghcide/test/data/working-dir/hie.yaml → ghcide-test/data/working-dir/hie.yaml b/ghcide/test/data/working-dir/hie.yaml → ghcide-test/data/working-dir/hie.yaml
diff --git a/ghcide/test/exe/AsyncTests.hs → ghcide-test/exe/AsyncTests.hs b/ghcide/test/exe/AsyncTests.hs → ghcide-test/exe/AsyncTests.hs
diff --git a/ghcide/test/exe/BootTests.hs → ghcide-test/exe/BootTests.hs b/ghcide/test/exe/BootTests.hs → ghcide-test/exe/BootTests.hs
diff --git a/ghcide/test/exe/CPPTests.hs → ghcide-test/exe/CPPTests.hs b/ghcide/test/exe/CPPTests.hs → ghcide-test/exe/CPPTests.hs
diff --git a/ghcide/test/exe/ClientSettingsTests.hs → ghcide-test/exe/ClientSettingsTests.hs b/ghcide/test/exe/ClientSettingsTests.hs → ghcide-test/exe/ClientSettingsTests.hs
diff --git a/ghcide/test/exe/CodeLensTests.hs → ghcide-test/exe/CodeLensTests.hs b/ghcide/test/exe/CodeLensTests.hs → ghcide-test/exe/CodeLensTests.hs
diff --git a/ghcide/test/exe/CompletionTests.hs → ghcide-test/exe/CompletionTests.hs b/ghcide/test/exe/CompletionTests.hs → ghcide-test/exe/CompletionTests.hs
diff --git a/ghcide/test/exe/Config.hs → ghcide-test/exe/Config.hs b/ghcide/test/exe/Config.hs → ghcide-test/exe/Config.hs
@@ -28,6 +28,7 @@ module Config(
     , withLongTimeout
     , lspTestCaps
     , lspTestCapsNoFileWatches
+    , testDataDir
     ) where
 
 import           Control.Exception           (bracket_)
@@ -47,7 +48,7 @@ import           Test.Hls
 import qualified Test.Hls.FileSystem         as FS
 
 testDataDir :: FilePath
-testDataDir = "ghcide" </> "test" </> "data"
+testDataDir = "ghcide-test" </> "data"
 
 mkIdeTestFs :: [FS.FileTree] -> FS.VirtualFileTree
 mkIdeTestFs = FS.mkVirtualFileTree testDataDir

diff --git a/ghcide/test/exe/CradleTests.hs → ghcide-test/exe/CradleTests.hs b/ghcide/test/exe/CradleTests.hs → ghcide-test/exe/CradleTests.hs
diff --git a/ghcide/test/exe/DependentFileTest.hs → ghcide-test/exe/DependentFileTest.hs b/ghcide/test/exe/DependentFileTest.hs → ghcide-test/exe/DependentFileTest.hs
diff --git a/ghcide/test/exe/DiagnosticTests.hs → ghcide-test/exe/DiagnosticTests.hs b/ghcide/test/exe/DiagnosticTests.hs → ghcide-test/exe/DiagnosticTests.hs
diff --git a/ghcide/test/exe/ExceptionTests.hs → ghcide-test/exe/ExceptionTests.hs b/ghcide/test/exe/ExceptionTests.hs → ghcide-test/exe/ExceptionTests.hs
diff --git a/...e/test/exe/FindDefinitionAndHoverTests.hs → ...e-test/exe/FindDefinitionAndHoverTests.hs b/...e/test/exe/FindDefinitionAndHoverTests.hs → ...e-test/exe/FindDefinitionAndHoverTests.hs
diff --git a/...st/exe/FindImplementationAndHoverTests.hs → ...st/exe/FindImplementationAndHoverTests.hs b/...st/exe/FindImplementationAndHoverTests.hs → ...st/exe/FindImplementationAndHoverTests.hs
diff --git a/ghcide/test/exe/FuzzySearch.hs → ghcide-test/exe/FuzzySearch.hs b/ghcide/test/exe/FuzzySearch.hs → ghcide-test/exe/FuzzySearch.hs
diff --git a/ghcide/test/exe/GarbageCollectionTests.hs → ghcide-test/exe/GarbageCollectionTests.hs b/ghcide/test/exe/GarbageCollectionTests.hs → ghcide-test/exe/GarbageCollectionTests.hs
diff --git a/ghcide/test/exe/HaddockTests.hs → ghcide-test/exe/HaddockTests.hs b/ghcide/test/exe/HaddockTests.hs → ghcide-test/exe/HaddockTests.hs
diff --git a/ghcide/test/exe/HieDbRetry.hs → ghcide-test/exe/HieDbRetry.hs b/ghcide/test/exe/HieDbRetry.hs → ghcide-test/exe/HieDbRetry.hs
diff --git a/ghcide/test/exe/HighlightTests.hs → ghcide-test/exe/HighlightTests.hs b/ghcide/test/exe/HighlightTests.hs → ghcide-test/exe/HighlightTests.hs
diff --git a/ghcide/test/exe/IfaceTests.hs → ghcide-test/exe/IfaceTests.hs b/ghcide/test/exe/IfaceTests.hs → ghcide-test/exe/IfaceTests.hs
diff --git a/ghcide/test/exe/InitializeResponseTests.hs → ghcide-test/exe/InitializeResponseTests.hs b/ghcide/test/exe/InitializeResponseTests.hs → ghcide-test/exe/InitializeResponseTests.hs
diff --git a/ghcide/test/exe/LogType.hs → ghcide-test/exe/LogType.hs b/ghcide/test/exe/LogType.hs → ghcide-test/exe/LogType.hs
diff --git a/ghcide/test/exe/Main.hs → ghcide-test/exe/Main.hs b/ghcide/test/exe/Main.hs → ghcide-test/exe/Main.hs
diff --git a/ghcide/test/exe/NonLspCommandLine.hs → ghcide-test/exe/NonLspCommandLine.hs b/ghcide/test/exe/NonLspCommandLine.hs → ghcide-test/exe/NonLspCommandLine.hs
@@ -14,6 +14,7 @@ import           System.Process.Extra     (CreateProcess (cwd), proc,
                                            readCreateProcessWithExitCode)
 import           Test.Tasty
 import           Test.Tasty.HUnit
+import           Config                   (testDataDir)
 
 
 -- A test to ensure that the command line ghcide workflow stays working
@@ -44,7 +45,7 @@ withTempDir f = System.IO.Extra.withTempDir $ canonicalizePath >=> f
 copyTestDataFiles :: FilePath -> FilePath -> IO ()
 copyTestDataFiles dir prefix = do
   -- Copy all the test data files to the temporary workspace
-  testDataFiles <- getDirectoryFilesIO ("ghcide/test/data" </> prefix) ["//*"]
+  testDataFiles <- getDirectoryFilesIO (testDataDir </> prefix) ["//*"]
   for_ testDataFiles $ \f -> do
     createDirectoryIfMissing True $ dir </> takeDirectory f
-    copyFile ("ghcide/test/data" </> prefix </> f) (dir </> f)
+    copyFile (testDataDir </> prefix </> f) (dir </> f)
diff --git a/ghcide/test/exe/OpenCloseTest.hs → ghcide-test/exe/OpenCloseTest.hs b/ghcide/test/exe/OpenCloseTest.hs → ghcide-test/exe/OpenCloseTest.hs
diff --git a/ghcide/test/exe/OutlineTests.hs → ghcide-test/exe/OutlineTests.hs b/ghcide/test/exe/OutlineTests.hs → ghcide-test/exe/OutlineTests.hs
diff --git a/ghcide/test/exe/PluginSimpleTests.hs → ghcide-test/exe/PluginSimpleTests.hs b/ghcide/test/exe/PluginSimpleTests.hs → ghcide-test/exe/PluginSimpleTests.hs
diff --git a/ghcide/test/exe/PositionMappingTests.hs → ghcide-test/exe/PositionMappingTests.hs b/ghcide/test/exe/PositionMappingTests.hs → ghcide-test/exe/PositionMappingTests.hs
diff --git a/ghcide/test/exe/PreprocessorTests.hs → ghcide-test/exe/PreprocessorTests.hs b/ghcide/test/exe/PreprocessorTests.hs → ghcide-test/exe/PreprocessorTests.hs
diff --git a/ghcide/test/exe/Progress.hs → ghcide-test/exe/Progress.hs b/ghcide/test/exe/Progress.hs → ghcide-test/exe/Progress.hs
diff --git a/ghcide/test/exe/ReferenceTests.hs → ghcide-test/exe/ReferenceTests.hs b/ghcide/test/exe/ReferenceTests.hs → ghcide-test/exe/ReferenceTests.hs
diff --git a/ghcide/test/exe/ResolveTests.hs → ghcide-test/exe/ResolveTests.hs b/ghcide/test/exe/ResolveTests.hs → ghcide-test/exe/ResolveTests.hs
diff --git a/ghcide/test/exe/RootUriTests.hs → ghcide-test/exe/RootUriTests.hs b/ghcide/test/exe/RootUriTests.hs → ghcide-test/exe/RootUriTests.hs
diff --git a/ghcide/test/exe/SafeTests.hs → ghcide-test/exe/SafeTests.hs b/ghcide/test/exe/SafeTests.hs → ghcide-test/exe/SafeTests.hs
diff --git a/ghcide/test/exe/SymlinkTests.hs → ghcide-test/exe/SymlinkTests.hs b/ghcide/test/exe/SymlinkTests.hs → ghcide-test/exe/SymlinkTests.hs
diff --git a/ghcide/test/exe/THTests.hs → ghcide-test/exe/THTests.hs b/ghcide/test/exe/THTests.hs → ghcide-test/exe/THTests.hs
diff --git a/ghcide/test/exe/UnitTests.hs → ghcide-test/exe/UnitTests.hs b/ghcide/test/exe/UnitTests.hs → ghcide-test/exe/UnitTests.hs
diff --git a/ghcide/test/exe/WatchedFileTests.hs → ghcide-test/exe/WatchedFileTests.hs b/ghcide/test/exe/WatchedFileTests.hs → ghcide-test/exe/WatchedFileTests.hs
diff --git a/ghcide/test/manual/lhs/Bird.lhs → ghcide-test/manual/lhs/Bird.lhs b/ghcide/test/manual/lhs/Bird.lhs → ghcide-test/manual/lhs/Bird.lhs
diff --git a/ghcide/test/manual/lhs/Main.hs → ghcide-test/manual/lhs/Main.hs b/ghcide/test/manual/lhs/Main.hs → ghcide-test/manual/lhs/Main.hs
diff --git a/ghcide/test/manual/lhs/Test.lhs → ghcide-test/manual/lhs/Test.lhs b/ghcide/test/manual/lhs/Test.lhs → ghcide-test/manual/lhs/Test.lhs
diff --git a/ghcide/test/preprocessor/Main.hs → ghcide-test/preprocessor/Main.hs b/ghcide/test/preprocessor/Main.hs → ghcide-test/preprocessor/Main.hs
@@ -18,11 +18,6 @@ tested-with:        GHC ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8
 extra-source-files:
   CHANGELOG.md
   README.md
-  test/data/**/*.cabal
-  test/data/**/*.hs
-  test/data/**/*.hs-boot
-  test/data/**/*.project
-  test/data/**/*.yaml
 
 source-repository head
   type:     git
@@ -212,20 +207,6 @@ library
     ghc-options:
       -Werror
 
-flag test-exe
-  description: Build the ghcide-test-preprocessor executable
-  default:     True
-
-executable ghcide-test-preprocessor
-  import: warnings
-  default-language:   GHC2021
-  hs-source-dirs:   test/preprocessor
-  main-is:          Main.hs
-  build-depends:    base >=4 && <5
-
-  if !flag(test-exe)
-    buildable: False
-
 flag executable
   description: Build the ghcide executable
   default:     True

diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -2027,7 +2027,6 @@ test-suite func-test
   type:               exitcode-stdio-1.0
   build-tool-depends:
     haskell-language-server:haskell-language-server,
-    ghcide:ghcide-test-preprocessor
 
   build-depends:
     , aeson
@@ -2124,14 +2123,27 @@ benchmark benchmark
       , text
       , yaml
 
+flag test-exe
+  description: Build the ghcide-test-preprocessor executable
+  default:     True
+
+executable ghcide-test-preprocessor
+  import: warnings
+  default-language:   GHC2021
+  hs-source-dirs:   ghcide-test/preprocessor
+  main-is:          Main.hs
+  build-depends:    base >=4 && <5
+
+  if !flag(test-exe)
+    buildable: False
 
 test-suite ghcide-tests
   import: warnings
   type:               exitcode-stdio-1.0
   default-language:   GHC2021
   build-tool-depends:
     , ghcide:ghcide
-    , ghcide:ghcide-test-preprocessor
+    , haskell-language-server:ghcide-test-preprocessor
     , implicit-hie:gen-hie
 
   build-depends:
@@ -2174,7 +2186,7 @@ test-suite ghcide-tests
   if impl(ghc <9.3)
     build-depends: ghc-typelits-knownnat
 
-  hs-source-dirs:     ghcide/test/exe
+  hs-source-dirs:     ghcide-test/exe
   ghc-options:        -threaded -O0
 
   main-is:            Main.hs