[Git][ghc/ghc][master] 2 commits: testsuite: Skip tests requiring Hadrian deps in out-of-tree testsuite runs

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
1187a60a by Ben Gamari at 2024-11-22T23:34:39-05:00
testsuite: Skip tests requiring Hadrian deps in out-of-tree testsuite runs

Some testsuite tests require specific tools (e.g. `check-ppr` and
`check-exact`) beyond those shipped in the binary distribution. Skip
these tests.

Fixes #13897.

- - - - -
c37d7a2e by Ben Gamari at 2024-11-22T23:34:39-05:00
testsuite: Declare exactprint tests' dependency on check-exact

- - - - -


2 changed files:

- testsuite/driver/testlib.py
- testsuite/tests/ghc-api/exactprint/all.T


Changes:

=====================================
testsuite/driver/testlib.py
=====================================
@@ -1627,6 +1627,11 @@ async def test_common_work(name: TestName, opts,
             do_ways = []
             config.hadrian_deps |= getTestOpts().hadrian_deps
 
+        # Skip tests which require hadrian dependencies if we are testing
+        # an out-of-tree compiler as Hadrian is unavailable. See #13897.
+        if not config.in_tree_compiler and getTestOpts().hadrian_deps - {'test:ghc'}:
+            do_ways = []
+
         # Run the required tests...
         for way in do_ways:
             if stopping():


=====================================
testsuite/tests/ghc-api/exactprint/all.T
=====================================
@@ -1,3 +1,5 @@
+setTestOpts(req_hadrian_deps(['test:check-exact']))
+
 test('RenameCase1',   ignore_stderr, makefile_test, ['RenameCase1'])
 test('LayoutLet2',    ignore_stderr, makefile_test, ['LayoutLet2'])
 test('LayoutLet3',    ignore_stderr, makefile_test, ['LayoutLet3'])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d1172e20f29e6fbf53fa95726492bdb998c52582...c37d7a2e983f9c00a1c5da1fae4cb2a6b94a112b

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d1172e20f29e6fbf53fa95726492bdb998c52582...c37d7a2e983f9c00a1c5da1fae4cb2a6b94a112b
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241122/ead18781/attachment-0001.html>