Magnus pushed to branch wip/mangoiv/cherry-pick-fix-testdir at Glasgow Haskell Compiler / GHC
Commits:
-
8fb179ea
by mangoiv at 2026-04-16T16:12:50+02:00
2 changed files:
Changes:
| ... | ... | @@ -3005,6 +3005,12 @@ def normalise_errmsg(s: str) -> str: |
| 3005 | 3005 | # Emscripten displays cache info and old emcc doesn't support EMCC_LOGGING=0
|
| 3006 | 3006 | s = re.sub('cache:INFO: .*\n', '', s)
|
| 3007 | 3007 | |
| 3008 | + # on newer versions of MacOS X, the shipped ranlib warns about object files with no symbols,
|
|
| 3009 | + # however, these are completely benign stubs.
|
|
| 3010 | + # See https://gitlab.haskell.org/ghc/ghc/-/issues/27116
|
|
| 3011 | + if opsys('darwin'):
|
|
| 3012 | + s = modify_lines(s, lambda l: re.sub(r'.*ranlib:.*has no symbols', '', l))
|
|
| 3013 | + |
|
| 3008 | 3014 | return s
|
| 3009 | 3015 | |
| 3010 | 3016 | # normalise a .prof file, so that we can reasonably compare it against
|
| ... | ... | @@ -120,9 +120,7 @@ if config.os == 'darwin': |
| 120 | 120 | else:
|
| 121 | 121 | only_darwin = skip
|
| 122 | 122 | |
| 123 | -test('static001', [extra_files(['Static001.hs']),
|
|
| 124 | - only_darwin,
|
|
| 125 | - when(arch('x86_64'), expect_broken(8127))],
|
|
| 123 | +test('static001', [extra_files(['Static001.hs']), only_darwin],
|
|
| 126 | 124 | makefile_test, ['static001'])
|
| 127 | 125 | |
| 128 | 126 | test('dynHelloWorld',
|