diff --git a/cabal-testsuite/PackageTests/BuildToolPaths/cabal.test.hs b/cabal-testsuite/PackageTests/BuildToolPaths/cabal.test.hs
index 60df6ca1ac2bf5e5ef7c78f62477b8176df27f72..dc2559eb12f8ccafc6b7ebec2d36036ccb4f030f 100644
--- a/cabal-testsuite/PackageTests/BuildToolPaths/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/BuildToolPaths/cabal.test.hs
@@ -10,16 +10,19 @@ main = cabalTest $ do
-- shipped with a version of Cabal with SetupHooks).
-- Ever since 716b109c4ae908458b16af5d75c233c7d9fdfc06, we use --intree-cabal-lib in
-- CI, so we should always take the "Just" case which actually runs the test.
+ --
+ -- NB: be sure to use v2 commands, as otherwise the testsuite driver will not
+ -- pass --package-db flags.
Nothing -> skip "Cabal-hooks library unavailable."
- Just pkgdb -> recordMode DoNotRecord $ do
+ Just _pkgdb -> recordMode DoNotRecord $ do
-- At build-time:
--
-- - in a pre-build hook
-- - in a Template Haskell splice
- cabal "build" [ "all", "--enable-tests", "--enable-benchmarks", "--package-db=" ++ pkgdb ]
+ cabal "v2-build" [ "all", "--enable-tests", "--enable-benchmarks"]
-- At runtime of a test-suite
- cabal "test" [ "pbts", "--package-db=" ++ pkgdb ]
+ cabal "v2-test" [ "pbts" ]
-- At runtime of a benchmark
- cabal "bench" [ "pbts", "--package-db=" ++ pkgdb ]
+ cabal "v2-bench" [ "pbts" ]
-- At runtime of an executable
- cabal "run" [ "pbts-exe", "--package-db=" ++ pkgdb ]
+ cabal "v2-run" [ "pbts-exe" ]
diff --git a/cabal-testsuite/main/cabal-tests.hs b/cabal-testsuite/main/cabal-tests.hs
index c3d167e3b8c8ddcd7f991aef8555981cf6b425ee..f27ea9b6094ac414d2ec74dbb706a3f2841160d0 100644
--- a/cabal-testsuite/main/cabal-tests.hs
+++ b/cabal-testsuite/main/cabal-tests.hs
@@ -125,12 +125,13 @@ mainArgParser = MainArgs
<*> commonArgParser
-- Unpack and build a specific released version of Cabal and Cabal-syntax libraries
-buildCabalLibsProject :: String -> Verbosity -> Maybe FilePath -> FilePath -> IO FilePath
+buildCabalLibsProject :: String -> Verbosity -> Maybe FilePath -> FilePath -> IO [FilePath]
buildCabalLibsProject projString verb mbGhc dir = do
let prog_db = userSpecifyPaths [("ghc", path) | Just path <- [mbGhc] ] defaultProgramDb
(cabal, _) <- requireProgram verb (simpleProgram "cabal") prog_db
(ghc, _) <- requireProgram verb ghcProgram prog_db
+ let storeRoot = dir </> "store"
let pv = fromMaybe (error "no ghc version") (programVersion ghc)
let final_package_db = dir </> "dist-newstyle" </> "packagedb" </> "ghc-" ++ prettyShow pv
createDirectoryIfMissing True dir
@@ -138,16 +139,24 @@ buildCabalLibsProject projString verb mbGhc dir = do
runProgramInvocation verb
((programInvocation cabal
- ["--store-dir", dir </> "store"
+ ["--store-dir", storeRoot
, "--project-file=" ++ dir </> "cabal.project-test"
, "build"
, "-w", programPath ghc
, "Cabal", "Cabal-syntax", "Cabal-hooks"
] ) { progInvokeCwd = Just dir })
- return final_package_db
+ -- Determine the path to the packagedb in the store for this ghc version
+ storesByGhc <- getDirectoryContents storeRoot
+ case filter (prettyShow pv `isInfixOf`) storesByGhc of
+ [] -> return [final_package_db]
+ storeForGhc:_ -> do
+ let storePackageDB = (storeRoot </> storeForGhc </> "package.db")
+ return [storePackageDB, final_package_db]
-buildCabalLibsSpecific :: String -> Verbosity -> Maybe FilePath -> FilePath -> IO FilePath
+
+
+buildCabalLibsSpecific :: String -> Verbosity -> Maybe FilePath -> FilePath -> IO [FilePath]
buildCabalLibsSpecific ver verb mbGhc builddir_rel = do
let prog_db = userSpecifyPaths [("ghc", path) | Just path <- [mbGhc] ] defaultProgramDb
(cabal, _) <- requireProgram verb (simpleProgram "cabal") prog_db
@@ -166,7 +175,7 @@ buildCabalLibsSpecific ver verb mbGhc builddir_rel = do
buildCabalLibsProject ("packages: Cabal-" ++ ver ++ " Cabal-syntax-" ++ ver ++ " Cabal-hooks-" ++ hooksVer) verb mbGhc dir
-buildCabalLibsIntree :: String -> Verbosity -> Maybe FilePath -> FilePath -> IO FilePath
+buildCabalLibsIntree :: String -> Verbosity -> Maybe FilePath -> FilePath -> IO [FilePath]
buildCabalLibsIntree root verb mbGhc builddir_rel = do
dir <- canonicalizePath (builddir_rel </> "intree")
buildCabalLibsProject ("packages: " ++ root </> "Cabal" ++ " " ++ root </> "Cabal-syntax" ++ " " ++ root </> "Cabal-hooks") verb mbGhc dir
@@ -182,26 +191,26 @@ main = do
args <- execParser $ info (mainArgParser <**> helper) mempty
let verbosity = if mainArgVerbose args then verbose else normal
- mpkg_db <-
+ pkg_dbs <-
-- Not path to cabal-install so we're not going to run cabal-install tests so we
-- can skip setting up a Cabal library to use with cabal-install.
case argCabalInstallPath (mainCommonArgs args) of
Nothing -> do
when (isJust $ mainArgCabalSpec args)
(putStrLn "Ignoring Cabal library specification as cabal-install tests are not running")
- return Nothing
+ return []
-- Path to cabal-install is passed, so need to install the requested relevant version of Cabal
-- library.
Just {} ->
case mainArgCabalSpec args of
Nothing -> do
putStrLn "No Cabal library specified, using boot Cabal library with cabal-install tests"
- return Nothing
- Just BootCabalLib -> return Nothing
+ return []
+ Just BootCabalLib -> return []
Just (InTreeCabalLib root build_dir) ->
- Just <$> buildCabalLibsIntree root verbosity (argGhcPath (mainCommonArgs args)) build_dir
+ buildCabalLibsIntree root verbosity (argGhcPath (mainCommonArgs args)) build_dir
Just (SpecificCabalLib ver build_dir) ->
- Just <$> buildCabalLibsSpecific ver verbosity (argGhcPath (mainCommonArgs args)) build_dir
+ buildCabalLibsSpecific ver verbosity (argGhcPath (mainCommonArgs args)) build_dir
-- To run our test scripts, we need to be able to run Haskell code
-- linked against the Cabal library under test. The most efficient
@@ -228,7 +237,7 @@ main = do
-> IO result
runTest runner path
= runner Nothing [] path $
- ["--builddir", dist_dir, path] ++ ["--extra-package-db=" ++ pkg_db | Just pkg_db <- [mpkg_db]] ++ renderCommonArgs (mainCommonArgs args)
+ ["--builddir", dist_dir, path] ++ ["--extra-package-db=" ++ pkg_db | pkg_db <- pkg_dbs] ++ renderCommonArgs (mainCommonArgs args)
case mainArgTestPaths args of
[path] -> do
diff --git a/cabal-testsuite/src/Test/Cabal/Monad.hs b/cabal-testsuite/src/Test/Cabal/Monad.hs
index e817a89c282f820f230ad7a1dbfef4c128574538..861538692aab842a1b9cc4aba3042f5d8afca333 100644
--- a/cabal-testsuite/src/Test/Cabal/Monad.hs
+++ b/cabal-testsuite/src/Test/Cabal/Monad.hs
@@ -158,7 +158,7 @@ renderCommonArgs args =
data TestArgs = TestArgs {
testArgDistDir :: FilePath,
- testArgPackageDb :: Maybe FilePath,
+ testArgPackageDb :: [FilePath],
testArgScriptPath :: FilePath,
testCommonArgs :: CommonArgs
}
@@ -169,7 +169,7 @@ testArgParser = TestArgs
( help "Build directory of cabal-testsuite"
<> long "builddir"
<> metavar "DIR")
- <*> optional (option str
+ <*> many (option str
( help "Package DB which contains Cabal and Cabal-syntax"
<> long "extra-package-db"
<> metavar "DIR"))
@@ -333,7 +333,7 @@ runTestM mode m =
testMtimeChangeDelay = Nothing,
testScriptEnv = senv,
testSetupPath = dist_dir </> "build" </> "setup" </> "setup",
- testPackageDbPath = testArgPackageDb args,
+ testPackageDbPath = case testArgPackageDb args of [] -> Nothing; xs -> Just xs,
testSkipSetupTests = argSkipSetupTests (testCommonArgs args),
testHaveCabalShared = runnerWithSharedLib senv,
testEnvironment =
@@ -649,8 +649,8 @@ data TestEnv = TestEnv
-- | Setup script path
, testSetupPath :: FilePath
-- | Setup package-db path which contains Cabal and Cabal-syntax for cabal-install to
- -- use when compiling custom setups.
- , testPackageDbPath :: Maybe FilePath
+ -- use when compiling custom setups, plus the store with possible dependencies of those setup packages.
+ , testPackageDbPath :: Maybe [FilePath]
-- | Skip Setup tests?
, testSkipSetupTests :: Bool
-- | Do we have shared libraries for the Cabal-under-tests?
diff --git a/cabal-testsuite/src/Test/Cabal/Prelude.hs b/cabal-testsuite/src/Test/Cabal/Prelude.hs
index 8a0aaff928b606f166b96011a6882120ccaaa707..b72e427c91bcd130052990538cf26171a5d9a9a0 100644
--- a/cabal-testsuite/src/Test/Cabal/Prelude.hs
+++ b/cabal-testsuite/src/Test/Cabal/Prelude.hs
@@ -324,14 +324,13 @@ cabalGArgs global_args cmd args input = do
= [ "--builddir", testDistDir env
, "-j1" ]
++ [ "--project-file=" ++ fp | Just fp <- [testCabalProjectFile env] ]
- ++ ["--package-db=" ++ db | Just db <- [testPackageDbPath env]]
+ ++ ["--package-db=" ++ db | Just dbs <- [testPackageDbPath env], db <- dbs]
| "v1-" `isPrefixOf` cmd
= [ "--builddir", testDistDir env ]
++ install_args
-
| otherwise
= [ "--builddir", testDistDir env ]
- ++ ["--package-db=" ++ db | Just db <- [testPackageDbPath env]]
+ ++ ["--package-db=" ++ db | Just dbs <- [testPackageDbPath env], db <- dbs]
++ install_args
install_args
@@ -875,7 +874,7 @@ allCabalVersion = isCabalVersion all
isCabalVersion :: WithCallStack (((Version -> Bool) -> [Version] -> Bool) -> String -> TestM Bool)
isCabalVersion decide range = do
env <- getTestEnv
- cabal_pkgs <- ghcPkg_raw' $ ["--global", "list", "Cabal", "--simple"] ++ ["--package-db=" ++ db | Just db <- [testPackageDbPath env]]
+ cabal_pkgs <- ghcPkg_raw' $ ["--global", "list", "Cabal", "--simple"] ++ ["--package-db=" ++ db | Just dbs <- [testPackageDbPath env], db <- dbs]
let pkg_versions :: [PackageIdentifier] = mapMaybe simpleParsec (words (resultOutput cabal_pkgs))
vr <- case eitherParsec range of
Left err -> fail err