Skip to content

[!14786] testsuite: testsuite: update tests for non-dynamic builds #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[!14786] testsuite: testsuite: update tests for non-dynamic builds #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17b3d7c
testsuite: adapt to cabal update, and gate plugins-external by ghc_dy…
angerman Sep 2, 2025
6981fbc
testsuite: T20010 isn't broken on linux/non-dynamic only. It's also b…
angerman Sep 2, 2025
41ab53e
testsuite: T13786 does not appear broken on linux with non-dynamic.
angerman Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ Building library 'p' instantiated with
B = <B>
for bkpcabal08-0.1.0.0...
[2 of 2] Compiling B[sig] ( p/B.hsig, nothing )
Preprocessing library 'impl' for bkpcabal08-0.1.0.0...
Building library 'impl' for bkpcabal08-0.1.0.0...
Preprocessing library 'q' for bkpcabal08-0.1.0.0...
Building library 'q' instantiated with
A = <A>
Expand All @@ -14,6 +12,8 @@ for bkpcabal08-0.1.0.0...
[2 of 4] Compiling B[sig] ( q/B.hsig, nothing )
[3 of 4] Compiling M ( q/M.hs, nothing ) [A changed]
[4 of 4] Instantiating bkpcabal08-0.1.0.0-LjROTJ30vjpHLvYNUnY1dD-p
Preprocessing library 'impl' for bkpcabal08-0.1.0.0...
Building library 'impl' for bkpcabal08-0.1.0.0...
Preprocessing library 'q' for bkpcabal08-0.1.0.0...
Building library 'q' instantiated with
A = bkpcabal08-0.1.0.0-KxkxGUgMJM6Dqo87AQu6V5-impl:A
Expand Down
12 changes: 11 additions & 1 deletion testsuite/tests/cabal/cabal03/all.T
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
import re

def drop_callstack(s):
# Remove dieProgress call stack blocks (Cabal commit eab5a10d0b...).
# Also remove the preceding blank line (if any) to avoid leaving an extra blank.
s = re.sub(r'(?ms)\n?\s*CallStack \(from HasCallStack\):\n(?:\s+.*\n)*', '\n', s)
# Collapse any runs of >1 blank line to a single newline.
return re.sub(r'\n{3,}', '\n\n', s)

test('cabal03',
[extra_files(['Setup.lhs', 'p/', 'q/', 'r/']),
js_broken(22349)],
js_broken(22349),
normalise_errmsg_fun(drop_callstack)],
makefile_test,
[])
2 changes: 1 addition & 1 deletion testsuite/tests/ghci/T13786/all.T
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
test('T13786',
[when(unregisterised(), fragile(17018)), req_c, when(opsys('linux') and not ghc_dynamic(), expect_broken(20706))],
[when(unregisterised(), fragile(17018)), req_c],
makefile_test, [])

8 changes: 7 additions & 1 deletion testsuite/tests/package/T20010/all.T
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# Test that GHC links to the C++ standard library as expected
# when the system-cxx-std-lib package is used.
test('T20010', req_c, makefile_test, [])
test('T20010-ghci', [req_c, extra_files(['T20010_c.cpp', 'T20010.hs']), when(opsys('linux') and not ghc_dynamic(), expect_broken(20706))], makefile_test, [])
test('T20010-ghci', [req_c, extra_files(['T20010_c.cpp', 'T20010.hs']),
# this test is broken for dynamic builds. However, windows
# is dynamic, but not really, and works significanlty
# different from linux and darwin to not be broken when
# ghc claims to be dynamic.
unless(ghc_dynamic() and not opsys('mingw32'), expect_broken(20706))],
makefile_test, [])
3 changes: 2 additions & 1 deletion testsuite/tests/plugins/all.T
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,8 @@ test('test-echo-in-line-many-args',
test('plugins-external',
[extra_files(['shared-plugin/']),
pre_cmd('$MAKE -s --no-print-directory -C shared-plugin package.plugins01 TOP={top}'),
when(opsys('mingw32') or (opsys('linux') and not ghc_dynamic()), expect_broken(20706))],
unless(ghc_dynamic(), skip),
when(opsys('mingw32'), expect_broken(20706))],
makefile_test, [])

test('test-phase-hooks-plugin',
Expand Down