From 1d9d69b076e101ee67842b4e82423e8d57559544 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Sun, 18 Nov 2018 12:37:14 +0100
Subject: Allow v2-build projects to not have a cabal.project file

---
 tests/GhcSession.hs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'tests')

diff --git a/tests/GhcSession.hs b/tests/GhcSession.hs
index 91845d4..f582242 100644
--- a/tests/GhcSession.hs
+++ b/tests/GhcSession.hs
@@ -58,7 +58,6 @@ data CabalCommands pt =
   CabalCommands
     { cabalDistDir          :: FilePath -> DistDir pt
     , cabalProjDir          :: FilePath -> ProjLoc pt
-    , cabalAddProject       :: FilePath -> IO ()
     , cabalConfigureCommand :: String
     , cabalBuildCommand     :: String
     , cabalSdistCommand     :: String
@@ -68,7 +67,6 @@ oldBuild :: CabalCommands 'V1
 oldBuild = CabalCommands
     { cabalDistDir          = \d -> DistDirV1 (d </> "dist")
     , cabalProjDir          = \cf -> ProjLocCabalFile cf
-    , cabalAddProject       = \_ -> return ()
     , cabalConfigureCommand = "configure"
     , cabalBuildCommand     = "build"
     , cabalSdistCommand     = "sdist"
@@ -78,7 +76,6 @@ newBuild :: CabalCommands 'V2
 newBuild = CabalCommands
     { cabalDistDir          = \d -> DistDirV2 (d </> "dist-newstyle")
     , cabalProjDir          = \cf -> ProjLocV2Dir (takeDirectory cf)
-    , cabalAddProject       = addCabalProject
     , cabalConfigureCommand = "new-configure"
     , cabalBuildCommand     = "new-build"
     , cabalSdistCommand     = "sdist"
@@ -123,7 +120,6 @@ runTest c topdir projdir cabal_file act = do
     run "cabal" [ cabalSdistCommand c, "-v0", "--output-dir", dir ]
 
     setCurrentDirectory dir
-    cabalAddProject c $ dir
     run "cabal" [ cabalConfigureCommand c ]
 
     act c $ dir </> takeFileName cabal_file
-- 
cgit v1.2.3