summaryrefslogtreecommitdiff
path: root/hadrian/src/Settings/Builders/RunTest.hs
diff options
context:
space:
mode:
authorZubin Duggal <zubin.duggal@gmail.com>2021-12-14 18:11:18 +0530
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-01-26 19:45:58 -0500
commit83d3ad3148917028529b4c5614e2a03877e21863 (patch)
tree17c075b46256cd93a162f3c833fef91c8a4f8ba2 /hadrian/src/Settings/Builders/RunTest.hs
parentb5132f8659744303300a442212ccec4cba191e29 (diff)
downloadhaskell-83d3ad3148917028529b4c5614e2a03877e21863.tar.gz
hadrian: Allow testing of the stage1 compiler (#20755)
Diffstat (limited to 'hadrian/src/Settings/Builders/RunTest.hs')
-rw-r--r--hadrian/src/Settings/Builders/RunTest.hs4
1 files changed, 3 insertions, 1 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 ]