From c70e8076803bd29d7675ed493ebb1ca246891b34 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Tue, 6 Aug 2019 01:54:29 +0200 Subject: Fix ProjLoc to source directory correspondence We cannot always assume `takeDirectory cfg_file` will be the project source directory! --- tests/GhcSession.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/GhcSession.hs b/tests/GhcSession.hs index 39680a6..a963ae4 100644 --- a/tests/GhcSession.hs +++ b/tests/GhcSession.hs @@ -465,7 +465,7 @@ newBuildProjSetup :: ProjSetup0 newBuildProjSetup = ProjSetupDescr "cabal-v2" $ Right $ Ex $ ProjSetupImpl { psiProjType = SCabal SCV2 , psiDistDir = \dir -> DistDirCabal SCV2 (dir "dist-newstyle") - , psiProjLoc = \_cabal_file projdir -> ProjLocV2File $ projdir "cabal.project" + , psiProjLoc = \_cabal_file projdir -> ProjLocV2File (projdir "cabal.project") projdir -- TODO: check if cabal.project is there and only use -- V2File then, also remove addCabalProject below so we -- cover both cases. -- cgit v1.2.3