Commit a0c4f546 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

s/bootProgramsConfig/bootProgramDb/

parent b0f71075
......@@ -203,14 +203,14 @@ main = do
(mtimeChange, mtimeChange') <- calibrateMtimeChangeDelay
let suite = SuiteConfig
{ cabalDistPref = dist_dir
, bootProgramsConfig = boot_programs
, withProgramDb = with_programs
, packageDBStack = package_db_stack
, withGhcDBStack = with_ghc_db_stack
, suiteVerbosity = verbosity
, absoluteCWD = cabal_dir
, mtimeChangeDelay = mtimeChange'
{ cabalDistPref = dist_dir
, bootProgramDb = boot_programs
, withProgramDb = with_programs
, packageDBStack = package_db_stack
, withGhcDBStack = with_ghc_db_stack
, suiteVerbosity = verbosity
, absoluteCWD = cabal_dir
, mtimeChangeDelay = mtimeChange'
}
let toMillis :: Int -> Double
......
......@@ -175,7 +175,7 @@ onlyIfExists m = liftIO $
data SuiteConfig = SuiteConfig
-- | The programs used to build the Cabal under test.
-- Invariant: ghc and ghc-pkg are configured.
{ bootProgramsConfig :: ProgramDb
{ bootProgramDb :: ProgramDb
-- | The programs that are requested using @--with-compiler@
-- and @--with-hc-pkg@ to Cabal the under-test.
-- Invariant: ghc and ghc-pkg are configured.
......@@ -211,7 +211,7 @@ getProgram progdb program = prog
where Just prog = lookupProgram program progdb -- invariant!
getBootProgram :: SuiteConfig -> Program -> ConfiguredProgram
getBootProgram suite = getProgram (bootProgramsConfig suite)
getBootProgram suite = getProgram (bootProgramDb suite)
getWithProgram :: SuiteConfig -> Program -> ConfiguredProgram
getWithProgram suite = getProgram (withProgramDb suite)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment