diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-02-10 14:50:57 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-02-11 22:27:54 -0500 |
| commit | 4bce35758ca2f94b3f1056211fa0c2d5da550b3e (patch) | |
| tree | 5936693830345a98b1955eec8ed9c286ee271008 | |
| parent | 9cab90d9ffbaa9fac8458a63f82809f4b0be7d2b (diff) | |
| download | haskell-4bce35758ca2f94b3f1056211fa0c2d5da550b3e.tar.gz | |
testsuite: Make sure all tests trigger ghc rebuild
I made a mistake when implementing #21029 which meant that certain tests
didn't trigger a GHC recompilation. By adding the `test:ghc` target to
the default settings all tests will now depend on this target unless
explicitly opting out via the no_deps modifier.
| -rw-r--r-- | testsuite/driver/testglobals.py | 2 | ||||
| -rw-r--r-- | testsuite/driver/testlib.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index da82458fcf..6847cece68 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -447,7 +447,7 @@ class TestOptions: self.copy_files = False # The extra hadrian dependencies we need for this particular test - self.hadrian_deps = set() # type: Set[str] + self.hadrian_deps = set(["test:ghc"]) # type: Set[str] # The default set of options global default_testopts diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 74ba9909f1..8e286d32f8 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -125,12 +125,12 @@ def setTestOpts( f ): # type TestOpt = (name :: String, opts :: Object) -> IO () def normal( name, opts ): - opts.hadrian_deps.update(["test:ghc"]) return; # A test with no hadrian built dependencies, including the test compiler # This is used for linters. def no_deps( name, opts): + opts.hadrian_deps = set() return; def skip( name, opts ): |