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

s/withProgramsConfig/withProgramDb/

parent f2a5242f
...@@ -205,7 +205,7 @@ main = do ...@@ -205,7 +205,7 @@ main = do
let suite = SuiteConfig let suite = SuiteConfig
{ cabalDistPref = dist_dir { cabalDistPref = dist_dir
, bootProgramsConfig = boot_programs , bootProgramsConfig = boot_programs
, withProgramsConfig = with_programs , withProgramDb = with_programs
, packageDBStack = package_db_stack , packageDBStack = package_db_stack
, withGhcDBStack = with_ghc_db_stack , withGhcDBStack = with_ghc_db_stack
, suiteVerbosity = verbosity , suiteVerbosity = verbosity
......
...@@ -179,7 +179,7 @@ data SuiteConfig = SuiteConfig ...@@ -179,7 +179,7 @@ data SuiteConfig = SuiteConfig
-- | The programs that are requested using @--with-compiler@ -- | The programs that are requested using @--with-compiler@
-- and @--with-hc-pkg@ to Cabal the under-test. -- and @--with-hc-pkg@ to Cabal the under-test.
-- Invariant: ghc and ghc-pkg are configured. -- Invariant: ghc and ghc-pkg are configured.
, withProgramsConfig :: ProgramDb , withProgramDb :: ProgramDb
-- | The build directory that was used to build Cabal (used -- | The build directory that was used to build Cabal (used
-- to compile Setup scripts.) -- to compile Setup scripts.)
, cabalDistPref :: FilePath , cabalDistPref :: FilePath
...@@ -214,7 +214,7 @@ getBootProgram :: SuiteConfig -> Program -> ConfiguredProgram ...@@ -214,7 +214,7 @@ getBootProgram :: SuiteConfig -> Program -> ConfiguredProgram
getBootProgram suite = getProgram (bootProgramsConfig suite) getBootProgram suite = getProgram (bootProgramsConfig suite)
getWithProgram :: SuiteConfig -> Program -> ConfiguredProgram getWithProgram :: SuiteConfig -> Program -> ConfiguredProgram
getWithProgram suite = getProgram (withProgramsConfig suite) getWithProgram suite = getProgram (withProgramDb suite)
ghcProg :: SuiteConfig -> ConfiguredProgram ghcProg :: SuiteConfig -> ConfiguredProgram
ghcProg suite = getBootProgram suite ghcProgram ghcProg suite = getBootProgram suite ghcProgram
......
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