diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-12-08 16:56:15 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-12-22 14:47:40 -0500 |
| commit | 3ed909118126a93f03ef17fed52eaf602b91ae1b (patch) | |
| tree | 669ce30095f26b440cab35daf006b102a4c7c48f /testsuite/driver | |
| parent | 09b6cb45505c2c32ddaffcdb930fb3f7873b2cfc (diff) | |
| download | haskell-3ed909118126a93f03ef17fed52eaf602b91ae1b.tar.gz | |
testsuite: Remove reqlib modifier
The reqlib modifer was supposed to indicate that a test needed a certain
library in order to work. If the library happened to be installed then
the test would run as normal.
However, CI has never run these tests as the packages have not been
installed and we don't want out tests to depend on things which might
get externally broken by updating the compiler.
The new strategy is to run these tests in head.hackage, where the tests
have been cabalised as well as possible. Some tests couldn't be
transferred into the normal style testsuite but it's better than never
running any of the reqlib tests. https://gitlab.haskell.org/ghc/head.hackage/-/merge_requests/169
A few submodules also had reqlib tests and have been updated to remove
it.
Closes #16264 #20032 #17764 #16561
Diffstat (limited to 'testsuite/driver')
| -rw-r--r-- | testsuite/driver/testlib.py | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 42b979f1f0..d41fc9b88c 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -141,9 +141,6 @@ def no_lint( name, opts ): [opt for opt in opts.compiler_always_flags \ if opt not in ['-dcore-lint', '-dstg-lint', '-dcmm-lint']] -def reqlib( lib ): - return lambda name, opts, l=lib: _reqlib (name, opts, l ) - def stage1(name, opts): # See Note [Why is there no stage1 setup function?] framework_fail(name, 'stage1 setup function does not exist', @@ -206,15 +203,6 @@ def have_library(lib: str) -> bool: return got_it -def _reqlib( name, opts, lib ): - if not have_library(lib): - opts.expect = 'missing-lib' - opts.skip = True - else: - opts.extra_hc_opts = opts.extra_hc_opts + ' -package ' + lib + ' ' - for db in config.test_package_db: - opts.extra_hc_opts = opts.extra_hc_opts + ' -package-db=' + db + ' ' - def _req_hadrian_deps(name,opts,deps): opts.hadrian_deps.update(deps) |