diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-02-10 14:50:57 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-02-10 14:53:24 +0000 |
| commit | c85d21ac9828b5641f263367752803b1659c3153 (patch) | |
| tree | 11139235fcf11e796177a7f7e6f681092f140bde | |
| parent | 2a6f2681ad53899869473343e845bee189a809c3 (diff) | |
| download | haskell-wip/mpickering-testsuite.tar.gz | |
testsuite: Make sure all tests trigger ghc rebuildwip/mpickering-testsuite
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 ): |