Skip to content

Commit 555f1aa

Browse files
committed
Fix directory paths for test data and source directories
1 parent 22fe6e6 commit 555f1aa

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

ghcide-bench/src/Experiments.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -857,11 +857,9 @@ getBuildEdgesCount = tryCallTestPlugin GetBuildEdgesCount
857857
getRebuildsCount :: Session (Either (TResponseError @ClientToServer (Method_CustomMethod "test")) Int)
858858
getRebuildsCount = tryCallTestPlugin GetRebuildsCount
859859

860-
-- Copy&paste from ghcide/test/Development.IDE.Test
861860
getStoredKeys :: Session [Text]
862861
getStoredKeys = callTestPlugin GetStoredKeys
863862

864-
-- Copy&paste from ghcide/test/Development.IDE.Test
865863
tryCallTestPlugin :: (A.FromJSON b) => TestRequest -> Session (Either (TResponseError @ClientToServer (Method_CustomMethod "test")) b)
866864
tryCallTestPlugin cmd = do
867865
let cm = SMethod_CustomMethod (Proxy @"test")
@@ -873,7 +871,6 @@ tryCallTestPlugin cmd = do
873871
A.Success a -> Right a
874872
A.Error e -> error e
875873

876-
-- Copy&paste from ghcide/test/Development.IDE.Test
877874
callTestPlugin :: (A.FromJSON b) => TestRequest -> Session b
878875
callTestPlugin cmd = do
879876
res <- tryCallTestPlugin cmd

ghcide-test/exe/NonLspCommandLine.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ withTempDir f = System.IO.Extra.withTempDir $ canonicalizePath >=> f
4444
copyTestDataFiles :: FilePath -> FilePath -> IO ()
4545
copyTestDataFiles dir prefix = do
4646
-- Copy all the test data files to the temporary workspace
47-
testDataFiles <- getDirectoryFilesIO ("ghcide-test/test/data" </> prefix) ["//*"]
47+
testDataFiles <- getDirectoryFilesIO ("ghcide-test/data" </> prefix) ["//*"]
4848
for_ testDataFiles $ \f -> do
4949
createDirectoryIfMissing True $ dir </> takeDirectory f
50-
copyFile ("ghcide-test/test/data" </> prefix </> f) (dir </> f)
50+
copyFile ("ghcide-test/data" </> prefix </> f) (dir </> f)

0 commit comments

Comments
 (0)