Magnus pushed to branch wip/mangoiv/fix-static-001-darwin at Glasgow Haskell Compiler / GHC Commits: e3d32737 by mangoiv at 2026-03-30T16:51:54+02:00 testsuite: ignore stderr of static001 This reactivates the test on x86_64 darwin as this should have been done long ago and ignores warnings emitted by ranlib on newer version of the darwin toolchain since they are benign. (no symbols for stub libraries) Fixes #27116 - - - - - 4f98c4cd by mangoiv at 2026-03-30T16:54:38+02:00 REVERT: CI TEST - - - - - 4 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - testsuite/driver/testlib.py - testsuite/tests/driver/all.T Changes: ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -301,8 +301,8 @@ runnerTag arch (Linux _) = Amd64 -> "x86_64-linux" AArch64 -> "aarch64-linux" I386 -> "x86_64-linux" -runnerTag AArch64 Darwin = "aarch64-darwin" -runnerTag Amd64 Darwin = "x86_64-darwin-m1" +runnerTag AArch64 Darwin = "beta" +runnerTag Amd64 Darwin = "beta" runnerTag Amd64 Windows = "new-x86_64-windows" runnerTag Amd64 FreeBSD14 = "x86_64-freebsd14" runnerTag _ _ = error "Invalid arch/opsys" ===================================== .gitlab/jobs.yaml ===================================== @@ -50,7 +50,7 @@ ], "stage": "full-build", "tags": [ - "aarch64-darwin" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -838,7 +838,7 @@ ], "stage": "full-build", "tags": [ - "aarch64-darwin" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -1638,7 +1638,7 @@ ], "stage": "full-build", "tags": [ - "x86_64-darwin-m1" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -3877,7 +3877,7 @@ ], "stage": "full-build", "tags": [ - "aarch64-darwin" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -4459,7 +4459,7 @@ ], "stage": "full-build", "tags": [ - "x86_64-darwin-m1" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", @@ -5561,7 +5561,7 @@ ], "stage": "full-build", "tags": [ - "x86_64-darwin-m1" + "beta" ], "variables": { "BIGNUM_BACKEND": "gmp", ===================================== testsuite/driver/testlib.py ===================================== @@ -3043,6 +3043,12 @@ def normalise_errmsg(s: str) -> str: # Old emcc warns when we export HEAP8 but new one requires it (see #26290) s = s.replace('warning: invalid item in EXPORTED_RUNTIME_METHODS: HEAP8\nwarning: invalid item in EXPORTED_RUNTIME_METHODS: HEAPU8\nemcc: warning: warnings in JS library compilation [-Wjs-compiler]\n','') + # on newer versions of MacOS X, the shipped ranlib warns about object files with no symbols, + # however, these are completely benign stubs. + # See https://gitlab.haskell.org/ghc/ghc/-/issues/27116 + if opsys('darwin'): + s = re.sub(r'ranlib: warning:.*has no symbols\n', '', s) + return s # normalise a .prof file, so that we can reasonably compare it against ===================================== testsuite/tests/driver/all.T ===================================== @@ -120,9 +120,7 @@ if config.os == 'darwin': else: only_darwin = skip -test('static001', [extra_files(['Static001.hs']), - only_darwin, - when(arch('x86_64'), expect_broken(8127))], +test('static001', [extra_files(['Static001.hs']), only_darwin], makefile_test, ['static001']) test('dynHelloWorld', View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54728e0a7e148cd6b7944c4a5f11f06... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54728e0a7e148cd6b7944c4a5f11f06... You're receiving this email because of your account on gitlab.haskell.org.