From 304840f8073ef7b3369601a97afb0605326e79e3 Mon Sep 17 00:00:00 2001 From: Andrey Mokhov Date: Sat, 30 Jan 2016 23:58:57 +0000 Subject: [PATCH] Depend on Stage2 GHC, ghc-pkg and hpc in validate target. See #187. [skip ci] --- src/Builder.hs | 2 ++ src/Test.hs | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/Builder.hs b/src/Builder.hs index 71399a7e05..80fc4ba994 100644 --- a/src/Builder.hs +++ b/src/Builder.hs @@ -124,6 +124,8 @@ getBuilderPath = lift . builderPath specified :: Builder -> Action Bool specified = fmap (not . null) . builderPath +-- TODO: split into two functions: needBuilder (without laxDependencies) and +-- unsafeNeedBuilder (with the laxDependencies parameter) -- | Make sure a builder exists on the given path and rebuild it if out of date. -- If 'laxDependencies' is True then we do not rebuild GHC even if it is out of -- date (can save a lot of build time when changing GHC). diff --git a/src/Test.hs b/src/Test.hs index 06c82eb762..a79c9fcb40 100644 --- a/src/Test.hs +++ b/src/Test.hs @@ -15,6 +15,9 @@ import Settings.User testRules :: Rules () testRules = do "validate" ~> do + needBuilder False $ Ghc Stage2 -- TODO: get rid of False parameters + needBuilder False $ GhcPkg Stage1 + needBuilder False $ Hpc runMakeVerbose "testsuite/tests" ["fast"] "test" ~> do