diff options
| author | Zubin Duggal <zubin.duggal@gmail.com> | 2021-12-14 18:11:18 +0530 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-01-26 19:45:58 -0500 |
| commit | 83d3ad3148917028529b4c5614e2a03877e21863 (patch) | |
| tree | 17c075b46256cd93a162f3c833fef91c8a4f8ba2 /hadrian/src/Settings | |
| parent | b5132f8659744303300a442212ccec4cba191e29 (diff) | |
| download | haskell-83d3ad3148917028529b4c5614e2a03877e21863.tar.gz | |
hadrian: Allow testing of the stage1 compiler (#20755)
Diffstat (limited to 'hadrian/src/Settings')
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 4 | ||||
| -rw-r--r-- | hadrian/src/Settings/Default.hs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index 19d22a394f..168e64e217 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -9,6 +9,7 @@ import Packages import Settings.Builders.Common import qualified Data.Set as Set import Flavour +import qualified Context.Type as C getTestSetting :: TestSetting -> Expr String getTestSetting key = expr $ testSetting key @@ -54,7 +55,8 @@ runTestGhcFlags = do -- mirrors @testsuite/mk/test.mk@. runTestBuilderArgs :: Args runTestBuilderArgs = builder Testsuite ? do - pkgs <- expr $ stagePackages Stage1 + ctx <- getContext + pkgs <- expr $ stagePackages (C.stage ctx) libTests <- expr $ filterM doesDirectoryExist $ concat [ [ pkgPath pkg -/- "tests", pkgPath pkg -/- "tests-ghc" ] | pkg <- pkgs, isLibrary pkg, pkg /= rts, pkg /= libffi ] diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs index 93b14d0f7e..1ce66c3534 100644 --- a/hadrian/src/Settings/Default.hs +++ b/hadrian/src/Settings/Default.hs @@ -1,6 +1,6 @@ module Settings.Default ( -- * Packages that are build by default and for the testsuite - defaultPackages, testsuitePackages, + defaultPackages, testsuitePackages, stage0Packages, -- * Default build ways defaultLibraryWays, defaultRtsWays, @@ -70,6 +70,7 @@ stage0Packages = do , genapply , genprimopcode , ghc + , runGhc , ghcBoot , ghcBootTh , ghcHeap @@ -78,6 +79,7 @@ stage0Packages = do , haddock , hsc2hs , hpc + , hpcBin , mtl , parsec , templateHaskell |