diff options
| author | Alp Mestanogullari <alpmestan@gmail.com> | 2019-04-09 12:08:04 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-05-23 22:32:15 -0400 |
| commit | 04b4b98447c36a2d28fffe819c97c32b591479ee (patch) | |
| tree | 4323aadcc215c210110822161c6a8a822a5d67ca /hadrian/src/CommandLine.hs | |
| parent | 535a26c90f458801aeb1e941a3f541200d171e8f (diff) | |
| download | haskell-04b4b98447c36a2d28fffe819c97c32b591479ee.tar.gz | |
add an --hadrian mode to ./validate
When the '--hadrian' flag is passed to the validate script, we use hadrian
to build GHC, package it up in a binary distribution and later on run GHC's
testsuite against the said bindist, which gets installed locally in the process.
Along the way, this commit fixes a typo, an omission (build iserv binaries
before producing the bindist archive) and moves the Makefile that enables
'make install' on those bindists from being a list of strings in the code to
an actual file (it was becoming increasingly annoying to work with).
Finally, the Settings.Builders.Ghc part of this patch is necessary for being
able to use the installed binary distribution, in 'validate'.
Diffstat (limited to 'hadrian/src/CommandLine.hs')
| -rw-r--r-- | hadrian/src/CommandLine.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hadrian/src/CommandLine.hs b/hadrian/src/CommandLine.hs index 41b2f8d0b9..461898cdfd 100644 --- a/hadrian/src/CommandLine.hs +++ b/hadrian/src/CommandLine.hs @@ -146,7 +146,7 @@ readTestConfig config = readTestConfigFile :: Maybe String -> Either String (CommandLineArgs -> CommandLineArgs) readTestConfigFile filepath = - maybe (Left "Cannot parse test-speed") (Right . set) filepath + maybe (Left "Cannot parse test-config-file") (Right . set) filepath where set filepath flags = flags { testArgs = (testArgs flags) { testConfigFile = filepath } } |